diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-09-02 14:30:14 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-09-02 14:30:14 +0000 |
| commit | 4d07696aabac5fe920b9358816a4776b3fddb43a (patch) | |
| tree | 837df08544f6c446b79ddab8744ad9e62c590f7e | |
| parent | 8ac9e7f8460c4c46b8e3363efda679c6d62be59b (diff) | |
| parent | 9a1974aa9b9f08e90aec5cb6ea98b60f7eb86187 (diff) | |
| download | gitlab-ce-4d07696aabac5fe920b9358816a4776b3fddb43a.tar.gz | |
Merge branch 'zj-fix-gitlab-import' into 'master'
Fix GitLab import button
cc @MrChrisW
Closes gitlab-org/gitlab-ce#21795
See merge request !6167
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/new.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4237be33ac0..85f86d3031e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -77,6 +77,7 @@ v 8.12.0 (unreleased) v 8.11.5 (unreleased) - 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 GitLab import button v 8.11.4 - Fix resolving conflicts on forks. !6082 diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 0a1e2bb2cc6..fda0592dd41 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -55,7 +55,7 @@ = render 'bitbucket_import_modal' %div - 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') - unless gitlab_import_configured? = render 'gitlab_import_modal' |