diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-05 21:09:18 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-05 21:09:18 +0000 |
| commit | 76bb8ed48ac88210e426e751ff4c3186e3b0d214 (patch) | |
| tree | 985cae9edd2f1006b024401cb47134d4e5455f86 /app | |
| parent | 297e6e29f2eb76d67fc82538dd38e230f79787e2 (diff) | |
| parent | ccc7a00753100ffe76d33299fa5e4e94d4ad20c1 (diff) | |
| download | gitlab-ce-76bb8ed48ac88210e426e751ff4c3186e3b0d214.tar.gz | |
Merge branch '26352-user-dropdown-settings' into 'master'
26352 Change Profile settings to User / Settings
Closes #26352
See merge request !8453
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/search_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/profile.html.haml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index cdb9663877c..6645f13346d 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -39,7 +39,7 @@ module SearchHelper # Autocomplete results for various settings pages def default_autocomplete [ - { category: "Settings", label: "Profile settings", url: profile_path }, + { category: "Settings", label: "User settings", url: profile_path }, { category: "Settings", label: "SSH Keys", url: profile_keys_path }, { category: "Settings", label: "Dashboard", url: root_path }, { category: "Settings", label: "Admin Section", url: admin_root_path }, diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index f4e0244596c..9ecc0d11c95 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -44,7 +44,7 @@ %li = link_to "Profile", current_user, class: 'profile-link', aria: { label: "Profile" }, data: { user: current_user.username } %li - = link_to "Profile Settings", profile_path, aria: { label: "Profile Settings" } + = link_to "Settings", profile_path, aria: { label: "Settings" } %li = link_to "Help", help_path, aria: { label: "Help" } %li.divider diff --git a/app/views/layouts/profile.html.haml b/app/views/layouts/profile.html.haml index b77d3402a2e..0ee8a57dbd4 100644 --- a/app/views/layouts/profile.html.haml +++ b/app/views/layouts/profile.html.haml @@ -1,5 +1,5 @@ -- page_title "Profile Settings" -- header_title "Profile Settings", profile_path unless header_title +- page_title "User Settings" +- header_title "User Settings", profile_path unless header_title - sidebar "dashboard" - nav "profile" |