Commit 96cc120d authored by Clement Ho's avatar Clement Ho

Merge branch 'fix-app-layout-form-description' into 'master'

Fix application layout form description

See merge request gitlab-org/gitlab-ce!22658
parents 553cdc90 487761ba
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
Layout width Layout width
= f.select :layout, layout_choices, {}, class: 'form-control' = f.select :layout, layout_choices, {}, class: 'form-control'
.form-text.text-muted .form-text.text-muted
Choose between fixed (max. 1200px) and fluid (100%) application layout. Choose between fixed (max. 1280px) and fluid (100%) application layout.
.form-group .form-group
= f.label :dashboard, class: 'label-bold' do = f.label :dashboard, class: 'label-bold' do
Default dashboard Default dashboard
...@@ -56,6 +56,6 @@ ...@@ -56,6 +56,6 @@
Project overview content Project overview content
= f.select :project_view, project_view_choices, {}, class: 'form-control' = f.select :project_view, project_view_choices, {}, class: 'form-control'
.form-text.text-muted .form-text.text-muted
Choose what content you want to see on a project’s overview page Choose what content you want to see on a project’s overview page.
.form-group .form-group
= f.submit 'Save changes', class: 'btn btn-success' = f.submit 'Save changes', class: 'btn btn-success'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment