Merge branch 'navigation-toggle' into 'master'

Fix wording of nav toggle

See merge request !12796

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"

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"