Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ide

app/helpers/tree_helper.rb

@@ -14,7 +14,7 @@ module TreeHelper
 
   def repo_url(project)
     if controller_name == 'projects'
-      readme_path(project)
+      readme_path(project) || project_tree_path(project, project.default_branch)
     else
       request.original_url
     end

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

@@ -74,9 +74,7 @@
                     = link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username }
                   %li
                     = link_to "Settings", profile_path
-                  %li
-                    = link_to "Turn on new navigation", profile_preferences_path(anchor: "new-navigation")
-                  = render 'shared/repo/user_dropdown_link'
+                  = render 'shared/user_dropdown_experimental_features'
                   %li.divider
                   %li
                     = link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link"

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

@@ -68,9 +68,7 @@
                     = link_to "Profile", current_user, class: 'profile-link', data: { user: current_user.username }
                   %li
                     = link_to "Settings", profile_path
-                  %li
-                    = link_to "Turn off new navigation", profile_preferences_path(anchor: "new-navigation")
-                  = render 'shared/repo/user_dropdown_link'
+                  = render 'shared/user_dropdown_experimental_features'
                   %li.divider
                   %li
                     = link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link"

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

@@ -18,6 +18,8 @@
         = scheme.name
   .col-sm-12
     %hr
+    %h3#experimental-features Experimental features
+    %hr
   .col-lg-4.profile-settings-sidebar#new-navigation
     %h4.prepend-top-0
       New Navigation

app/views/shared/_user_dropdown_experimental_features.html.haml

@@ -0,0 +1 @@
+%li= link_to 'Experimental features', profile_preferences_path(anchor: 'experimental-features')

app/views/shared/repo/_user_dropdown_link.html.haml

@@ -1 +0,0 @@
-%li= link_to "Turn #{show_new_repo? ? 'off' : 'on'} new repository", profile_preferences_path(anchor: "new-repository")