summaryrefslogtreecommitdiff
path: root/app/views/layouts/header/_default.html.haml
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-08-08 09:14:00 -0500
committerMike Greiling <mike@pixelcog.com>2017-08-08 09:19:07 -0500
commit1c2f22eb0b1f2005fda16e4708bbff82167c3d52 (patch)
tree858a41472dd99ee1b45c1499a3e09951f53a5ae2 /app/views/layouts/header/_default.html.haml
parentfeb8974cc87455328dea708be556e41b59e8ba26 (diff)
downloadgitlab-ce-1c2f22eb0b1f2005fda16e4708bbff82167c3d52.tar.gz
Revert "Combine 'turn on/off' user dropdown links into 'experimental features' link and andded 'experimental features' heading for user preferences page"
This reverts commit 75f490a4c95c41f9364e8e0cba443b312f01a686.
Diffstat (limited to 'app/views/layouts/header/_default.html.haml')
-rw-r--r--app/views/layouts/header/_default.html.haml4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index df1dc736571..c7aa97a351f 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -74,7 +74,9 @@
= link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username }
%li
= link_to "Settings", profile_path
- = render 'shared/user_dropdown_experimental_features'
+ %li
+ = link_to "Turn on new navigation", profile_preferences_path(anchor: "new-navigation")
+ = render 'shared/repo/user_dropdown_link'
%li.divider
%li
= link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link"