diff options
| author | Phil Hughes <me@iamphill.com> | 2017-07-13 07:38:44 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-07-13 07:38:44 +0000 |
| commit | d741df1dfb5644bc4d17ce0719db1da236403c65 (patch) | |
| tree | f14ef30c65ad541cd2959d8148bd8ff48368560c | |
| parent | 3c197e74827b99a524a70f05fb4e955a036172b5 (diff) | |
| parent | 1e7e927e587c2eb419e1118900c4a5f7a62621af (diff) | |
| download | gitlab-ce-d741df1dfb5644bc4d17ce0719db1da236403c65.tar.gz | |
Merge branch 'navigation-toggle' into 'master'
Fix wording of nav toggle
See merge request !12796
| -rw-r--r-- | app/views/layouts/header/_default.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/header/_new.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index ed44263741e..25acdb700ef 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -75,7 +75,7 @@ %li = link_to "Settings", profile_path %li - = link_to "Turn on new nav", profile_preferences_path(anchor: "new-navigation") + = link_to "Turn on new navigation", profile_preferences_path(anchor: "new-navigation") %li.divider %li = link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link" diff --git a/app/views/layouts/header/_new.html.haml b/app/views/layouts/header/_new.html.haml index bee7291da45..5bc15d68631 100644 --- a/app/views/layouts/header/_new.html.haml +++ b/app/views/layouts/header/_new.html.haml @@ -69,7 +69,7 @@ %li = link_to "Settings", profile_path %li - = link_to "Turn off new nav", profile_preferences_path(anchor: "new-navigation") + = link_to "Turn off new navigation", profile_preferences_path(anchor: "new-navigation") %li.divider %li = link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link" |