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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
9a1974aa
Commit
9a1974aa
authored
Sep 02, 2016
by
Z.J. van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix GitLab import button
parent
33a367e8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
CHANGELOG
CHANGELOG
+1
-0
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+1
-1
No files found.
CHANGELOG
View file @
9a1974aa
...
@@ -74,6 +74,7 @@ v 8.12.0 (unreleased)
...
@@ -74,6 +74,7 @@ v 8.12.0 (unreleased)
v 8.11.5 (unreleased)
v 8.11.5 (unreleased)
- Optimize branch lookups and force a repository reload for Repository#find_branch
- Optimize branch lookups and force a repository reload for Repository#find_branch
- Fix suggested colors options for new labels in the admin area. !6138
- Fix suggested colors options for new labels in the admin area. !6138
- Fix GitLab import button
v 8.11.4
v 8.11.4
- Fix resolving conflicts on forks. !6082
- Fix resolving conflicts on forks. !6082
...
...
app/views/projects/new.html.haml
View file @
9a1974aa
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
=
render
'bitbucket_import_modal'
=
render
'bitbucket_import_modal'
%div
%div
-
if
gitlab_import_enabled?
-
if
gitlab_import_enabled?
=
link_to
status_import_gitlab_path
,
class:
"btn import_gitlab
#{
'how_to_import_link'
unless
bitbucket
_import_configured?
}
"
do
=
link_to
status_import_gitlab_path
,
class:
"btn import_gitlab
#{
'how_to_import_link'
unless
gitlab
_import_configured?
}
"
do
=
icon
(
'gitlab'
,
text:
'GitLab.com'
)
=
icon
(
'gitlab'
,
text:
'GitLab.com'
)
-
unless
gitlab_import_configured?
-
unless
gitlab_import_configured?
=
render
'gitlab_import_modal'
=
render
'gitlab_import_modal'
...
...
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