diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-21 11:54:20 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-21 11:54:20 +0000 |
| commit | 611ef0bcdd288023faad7e9ddbd34762164e0c3a (patch) | |
| tree | f62d99ae0b815adeada4856a956cdf974ec7fb25 | |
| parent | 8dd687bd5349f8b71c6a27c10d1f9701918fab94 (diff) | |
| parent | a42fab08fcee9f00a4782084393a8704b8438201 (diff) | |
| download | gitlab-ce-611ef0bcdd288023faad7e9ddbd34762164e0c3a.tar.gz | |
Merge branch 'import-github-scb' into 'master'
Resolve CE/EE diffs in import github
Closes gitlab-ee#10497
See merge request gitlab-org/gitlab-ce!28523
| -rw-r--r-- | app/views/import/github/new.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/import/github/new.html.haml b/app/views/import/github/new.html.haml index cf32c5c9387..72e5934574a 100644 --- a/app/views/import/github/new.html.haml +++ b/app/views/import/github/new.html.haml @@ -22,6 +22,8 @@ = text_field_tag :personal_access_token, '', class: 'form-control append-right-8', placeholder: _('Personal Access Token'), size: 40 = submit_tag _('List your GitHub repositories'), class: 'btn btn-success' + = render_if_exists 'import/github/ci_cd_only' + - unless github_import_configured? %hr %p |