Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
4e7de949
Commit
4e7de949
authored
Jan 22, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show modal window with instructions if GH OAuth is not enables
parent
c04f11da
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
4 deletions
+31
-4
app/views/projects/_github_import_modal.html.haml
app/views/projects/_github_import_modal.html.haml
+22
-0
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+9
-4
No files found.
app/views/projects/_github_import_modal.html.haml
0 → 100644
View file @
4e7de949
%div
#github_import_modal
.modal.hide
.modal-dialog
.modal-content
.modal-header
%a
.close
{
href:
"#"
,
"data-dismiss"
=>
"modal"
}
×
%h3
GitHub OAuth import
.modal-body
You need to setup integration with GitHub first.
=
link_to
'How to setup integration with GitHub'
,
'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/integration/github.md'
:javascript
$
(
function
(){
var
import_modal
=
$
(
'
#github_import_modal
'
).
modal
({
modal
:
true
,
show
:
false
});
$
(
'
.how_to_import_link
'
).
bind
(
"
click
"
,
function
(
e
){
e
.
preventDefault
();
import_modal
.
show
();
});
$
(
'
.modal-header .close
'
).
bind
(
"
click
"
,
function
(){
import_modal
.
hide
();
})
})
app/views/projects/new.html.haml
View file @
4e7de949
...
@@ -40,13 +40,18 @@
...
@@ -40,13 +40,18 @@
The import will time out after 4 minutes. For big repositories, use a clone/push combination.
The import will time out after 4 minutes. For big repositories, use a clone/push combination.
For SVN repositories, check
#{
link_to
"this migrating from SVN doc."
,
"http://doc.gitlab.com/ce/workflow/migrating_from_svn.html"
}
For SVN repositories, check
#{
link_to
"this migrating from SVN doc."
,
"http://doc.gitlab.com/ce/workflow/migrating_from_svn.html"
}
-
if
github_import_enabled?
.project-import.form-group
.project-import.form-group
.col-sm-2
.col-sm-2
.col-sm-10
.col-sm-10
-
if
github_import_enabled?
=
link_to
status_github_import_path
do
=
link_to
status_github_import_path
do
%i
.fa.fa-github
%i
.fa.fa-github
Import projects from GitHub
Import projects from GitHub
-
else
=
link_to
'#'
,
class:
'how_to_import_link light'
do
%i
.fa.fa-github
Import projects from GitHub
=
render
'github_import_modal'
%hr
.prepend-botton-10
%hr
.prepend-botton-10
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment