diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-09-07 13:38:55 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-09-07 13:38:55 +0000 |
| commit | cb555da178573ceac01f0b76060572545857364a (patch) | |
| tree | e1fec82c17bc0d47f518e257529a555018eee7f2 | |
| parent | b8adc0d0423ac53bf94aeb4361c3eb82a4e905c6 (diff) | |
| parent | 54bafaa690cc1e2d17085aaa8db51bc9f795d212 (diff) | |
| download | gitlab-ce-cb555da178573ceac01f0b76060572545857364a.tar.gz | |
Merge branch 'fix-stray-or-in-project-create-ui' into 'master'
Fix stray OR in New Project page
See merge request !14096
| -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 |