summaryrefslogtreecommitdiff
path: root/app/views/profiles
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-10-19 11:34:48 +0200
committerDouwe Maan <douwe@gitlab.com>2015-10-19 11:34:48 +0200
commit7ae139566b46050b31bf01a6302af560fc129819 (patch)
treecc342c422373d89d12aa763a8a924d241192b4a1 /app/views/profiles
parenta32f7766098bf38b1028168b4919516460a562e9 (diff)
parent8adeda37b55fc992e3cb15422cae5d9646640630 (diff)
downloadgitlab-ce-7ae139566b46050b31bf01a6302af560fc129819.tar.gz
Merge branch 'master' into full-width-tablesfull-width-tables
Diffstat (limited to 'app/views/profiles')
-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 01e285a8dfa..cc41d7dd813 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -38,7 +38,7 @@
.col-sm-10
= f.select :layout, layout_choices, {}, class: 'form-control'
.help-block
- Choose between fixed (max. 1200px) and fluid (100%) application layout
+ Choose between fixed (max. 1200px) and fluid (100%) application layout.
.form-group
= f.label :dashboard, class: 'control-label' do
Default Dashboard
@@ -52,6 +52,6 @@
.col-sm-10
= f.select :project_view, project_view_choices, {}, class: 'form-control'
.help-block
- Choose what content you want to see when visit project page
+ Choose what content you want to see on a project's home page.
.panel-footer
= f.submit 'Save', class: 'btn btn-save'