Merge branch '26352-user-dropdown-settings' into 'master'

26352 Change Profile settings to User / Settings

Closes #26352

See merge request !8453

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 },

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

app/views/layouts/profile.html.haml

-- 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"
 

changelogs/unreleased/26352-user-dropdown-settings.yml

+---
+title: 26352 Change Profile settings to User / Settings
+merge_request:
+author: