diff options
| author | Robin Bobbitt <ryehle@us.ibm.com> | 2017-09-06 16:32:36 -0400 |
|---|---|---|
| committer | Robin Bobbitt <ryehle@us.ibm.com> | 2017-09-06 16:38:17 -0400 |
| commit | 54bafaa690cc1e2d17085aaa8db51bc9f795d212 (patch) | |
| tree | 8c33d67fe82339526f6a734fcb14962691cc4f12 | |
| parent | 21935d85382989e38dd4cc12de55966e0c9b6eba (diff) | |
| download | gitlab-ce-54bafaa690cc1e2d17085aaa8db51bc9f795d212.tar.gz | |
Fix stray OR in New Project page
When all import sources are disabled, the New Project page shows
the "Create from template" options followed by an "OR" divider followed
by nothing in 9.5.x.
| -rw-r--r-- | app/views/projects/new.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-stray-or-in-project-create-ui.yml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index adffd67029a..819392b8f0c 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -28,8 +28,8 @@ = link_to icon('question-circle'), help_page_path("gitlab-basics/create-project"), target: '_blank', aria: { label: "What’s included in a template?" }, title: "What’s included in a template?", class: 'has-tooltip', data: { placement: 'top'} %div = render 'project_templates', f: f - .second-column - - if import_sources_enabled? + - if import_sources_enabled? + .second-column .project-import .form-group.clearfix = f.label :visibility_level, class: 'label-light' do #the label here seems wrong diff --git a/changelogs/unreleased/fix-stray-or-in-project-create-ui.yml b/changelogs/unreleased/fix-stray-or-in-project-create-ui.yml new file mode 100644 index 00000000000..ae4df3ee31a --- /dev/null +++ b/changelogs/unreleased/fix-stray-or-in-project-create-ui.yml @@ -0,0 +1,5 @@ +--- +title: Fix stray OR in New Project page +merge_request: 14096 +author: Robin Bobbitt +type: fixed |