diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index cdb9663877cd37b0a2d994c24d6c7a2956f39e1c..6645f13346da1c3bb3c4938a95031c30f36b5265 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 f4e0244596c21472511c1064951c9c1d566d7f8b..9ecc0d11c9588c61fc4ebfab9d9fe5f32b41fb79 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 b77d3402a2e6381e56e066905c0b5938ed8a4dd6..0ee8a57dbd4d1b4bda4f8837da0a538d81ba5080 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 0000000000000000000000000000000000000000..19bd47b8673d332dab22d480e3bc7e4a00f069ec --- /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: