diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-09-02 14:30:14 +0000 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-09-13 20:59:42 -0500 |
| commit | 70ddbfc3e50e3331a4f672201a439d95daa5b981 (patch) | |
| tree | 04d78c7e7dd745d7d4b6cb98674135a3e80b9661 | |
| parent | 86f5611904b8635ceb9f6ee67f41b2319222b820 (diff) | |
| download | gitlab-ce-70ddbfc3e50e3331a4f672201a439d95daa5b981.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 96908664e30..5252e20a027 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -144,6 +144,7 @@ v 8.11.5 - Fix confidential issues being exposed as public using gitlab.com export - Remove gitorious from import_sources. !6180 - Scope webhooks/services that will run for confidential issues + - 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' |