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

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,9 +74,8 @@
                     = 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
+                    = link_to "Turn on new nav", 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/profiles/preferences/show.html.haml

@@ -16,25 +16,22 @@
         .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
-      %h4.prepend-top-0
-        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"
-        %input.js-experiment-feature-toggle{ type: "radio", value: "false", name: "new_nav", checked: !show_new_nav? }
-        Old
-      = label_tag do
-        .preview= image_tag "new_nav.png"
-        %input.js-experiment-feature-toggle{ type: "radio", value: "true", name: "new_nav", checked: show_new_nav? }
-        New
+  .col-sm-12
+    %hr
+  .col-lg-3.profile-settings-sidebar#new-navigation
+    %h4.prepend-top-0
+      New Navigation
+    %p
+      This setting allows you to turn on or off the new upcoming navigation concept.
+  .col-lg-9.syntax-theme
+    = label_tag do
+      .preview= image_tag "old_nav.png"
+      %input.js-experiment-feature-toggle{ type: "radio", value: "false", name: "new_nav", checked: !show_new_nav? }
+      Old
+    = label_tag do
+      .preview= image_tag "new_nav.png"
+      %input.js-experiment-feature-toggle{ type: "radio", value: "true", name: "new_nav", checked: show_new_nav? }
+      New
   .col-sm-12
     %hr
   .col-lg-4.profile-settings-sidebar