diff options
| author | tauriedavis <taurie@gitlab.com> | 2017-01-04 14:05:53 -0800 |
|---|---|---|
| committer | tauriedavis <taurie@gitlab.com> | 2017-01-04 14:06:39 -0800 |
| commit | ccc7a00753100ffe76d33299fa5e4e94d4ad20c1 (patch) | |
| tree | e671886d1878f6fe70784aab30e5930271e25d9f | |
| parent | 80c9a1a0b072f71e681739d31d61317328202fde (diff) | |
| download | gitlab-ce-26352-user-dropdown-settings.tar.gz | |
26352 Change Profile settings to User / Settings26352-user-dropdown-settings
| -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 | ||||
| -rw-r--r-- | changelogs/unreleased/26352-user-dropdown-settings.yml | 4 |
4 files changed, 8 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" diff --git a/changelogs/unreleased/26352-user-dropdown-settings.yml b/changelogs/unreleased/26352-user-dropdown-settings.yml new file mode 100644 index 00000000000..19bd47b8673 --- /dev/null +++ b/changelogs/unreleased/26352-user-dropdown-settings.yml @@ -0,0 +1,4 @@ +--- +title: 26352 Change Profile settings to User / Settings +merge_request: +author: |