Merge branch '26352-user-dropdown-settings' into 'master'
26352 Change Profile settings to User / Settings Closes #26352 See merge request !8453
This commit is contained in:
commit
76bb8ed48a
|
@ -39,7 +39,7 @@ module SearchHelper
|
||||||
# Autocomplete results for various settings pages
|
# Autocomplete results for various settings pages
|
||||||
def default_autocomplete
|
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: "SSH Keys", url: profile_keys_path },
|
||||||
{ category: "Settings", label: "Dashboard", url: root_path },
|
{ category: "Settings", label: "Dashboard", url: root_path },
|
||||||
{ category: "Settings", label: "Admin Section", url: admin_root_path },
|
{ category: "Settings", label: "Admin Section", url: admin_root_path },
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
%li
|
%li
|
||||||
= link_to "Profile", current_user, class: 'profile-link', aria: { label: "Profile" }, data: { user: current_user.username }
|
= link_to "Profile", current_user, class: 'profile-link', aria: { label: "Profile" }, data: { user: current_user.username }
|
||||||
%li
|
%li
|
||||||
= link_to "Profile Settings", profile_path, aria: { label: "Profile Settings" }
|
= link_to "Settings", profile_path, aria: { label: "Settings" }
|
||||||
%li
|
%li
|
||||||
= link_to "Help", help_path, aria: { label: "Help" }
|
= link_to "Help", help_path, aria: { label: "Help" }
|
||||||
%li.divider
|
%li.divider
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
- page_title "Profile Settings"
|
- page_title "User Settings"
|
||||||
- header_title "Profile Settings", profile_path unless header_title
|
- header_title "User Settings", profile_path unless header_title
|
||||||
- sidebar "dashboard"
|
- sidebar "dashboard"
|
||||||
- nav "profile"
|
- nav "profile"
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
title: 26352 Change Profile settings to User / Settings
|
||||||
|
merge_request:
|
||||||
|
author:
|
Loading…
Reference in New Issue