From 54bafaa690cc1e2d17085aaa8db51bc9f795d212 Mon Sep 17 00:00:00 2001 From: Robin Bobbitt Date: Wed, 6 Sep 2017 16:32:36 -0400 Subject: 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. --- app/views/projects/new.html.haml | 4 ++-- changelogs/unreleased/fix-stray-or-in-project-create-ui.yml | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 changelogs/unreleased/fix-stray-or-in-project-create-ui.yml 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 -- cgit v1.2.1