Merge branch 'enable-new-navigation-option-in-preferences' into 'master'

Enables the option in user preferences to turn on the new navigation

See merge request !12630

app/helpers/application_helper.rb

@@ -298,10 +298,6 @@ module ApplicationHelper
     end
   end
 
-  def can_toggle_new_nav?
-    Rails.env.development?
-  end
-
   def show_new_nav?
     cookies["new_nav"] == "true"
   end

app/views/layouts/header/_default.html.haml

@@ -74,7 +74,6 @@
                     = link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username }
                   %li
                     = link_to "Settings", profile_path
-                  - if can_toggle_new_nav?
                   %li
                     = link_to "Turn on new nav", profile_preferences_path(anchor: "new-navigation")
                   %li.divider

app/views/profiles/preferences/show.html.haml

@@ -16,7 +16,6 @@
         .preview= image_tag "#{scheme.css_class}-scheme-preview.png"
         = f.radio_button :color_scheme_id, scheme.id
         = scheme.name
-  - if can_toggle_new_nav?
   .col-sm-12
     %hr
   .col-lg-3.profile-settings-sidebar#new-navigation
@@ -24,8 +23,6 @@
       New Navigation
     %p
       This setting allows you to turn on or off the new upcoming navigation concept.
-        = succeed '.' do
-          = link_to 'Learn more', '', target: '_blank'
   .col-lg-9.syntax-theme
     = label_tag do
       .preview= image_tag "old_nav.png"