summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-10-30 17:10:00 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-10-30 17:10:00 +0000
commit96cc120dc8453892cddc527ec2d395be04250838 (patch)
tree97a4606a575a622115cd0006cb25cd84b15106d3
parent553cdc902df73210e934202dd0e38b46ecc25091 (diff)
parent487761bab09c92bf096f70a1ea020890a739d5bc (diff)
downloadgitlab-ce-96cc120dc8453892cddc527ec2d395be04250838.tar.gz
Merge branch 'fix-app-layout-form-description' into 'master'
Fix application layout form description See merge request gitlab-org/gitlab-ce!22658
-rw-r--r--app/views/profiles/preferences/show.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index 156c0d05b02..7c378633667 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -46,7 +46,7 @@
Layout width
= f.select :layout, layout_choices, {}, class: 'form-control'
.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
= f.label :dashboard, class: 'label-bold' do
Default dashboard
@@ -56,6 +56,6 @@
Project overview content
= f.select :project_view, project_view_choices, {}, class: 'form-control'
.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
= f.submit 'Save changes', class: 'btn btn-success'