summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-06-01 11:44:48 +0000
committerDouwe Maan <douwe@gitlab.com>2018-06-01 11:44:48 +0000
commit78fe35ccc382372a4047630e3ccfafe8fabb5c00 (patch)
tree908b8d6a1bad6be3746d321f87697dcc39a34774
parentaa8d367509afc304eab733f7798b28fb33e0449c (diff)
parentb7d3c8bd2465c95050ab4619adbab539ab391ec4 (diff)
downloadgitlab-ce-78fe35ccc382372a4047630e3ccfafe8fabb5c00.tar.gz
Merge branch 'update-preferences-header' into 'master'
Remove 'GitLab' from user preferences header See merge request gitlab-org/gitlab-ce!19289
-rw-r--r--app/views/profiles/preferences/show.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/profiles/preferences/show.html.haml b/app/views/profiles/preferences/show.html.haml
index ab5565cfdaf..ce312943154 100644
--- a/app/views/profiles/preferences/show.html.haml
+++ b/app/views/profiles/preferences/show.html.haml
@@ -4,7 +4,7 @@
= form_for @user, url: profile_preferences_path, remote: true, method: :put, html: { class: 'row prepend-top-default js-preferences-form' } do |f|
.col-lg-4.application-theme
%h4.prepend-top-0
- GitLab navigation theme
+ s_('Preferences|Navigation theme')
%p Customize the appearance of the application header and navigation sidebar.
.col-lg-8.application-theme
- Gitlab::Themes.each do |theme|