Merge branch '7048_add_preference_ui_for_group_overview_be-ce' into 'master'

Add UI for "Group Overview default" preference in User Settings

See merge request gitlab-org/gitlab-ce!24761

app/controllers/profiles/preferences_controller.rb

@@ -33,12 +33,10 @@ class Profiles::PreferencesController < Profiles::ApplicationController
   end
 
   def preferences_params
-    params.require(:user).permit(
-      :color_scheme_id,
-      :layout,
-      :dashboard,
-      :project_view,
-      :theme_id
-    )
+    params.require(:user).permit(preferences_param_names)
+  end
+
+  def preferences_param_names
+    [:color_scheme_id, :layout, :dashboard, :project_view, :theme_id]
   end
 end

app/views/layouts/nav/sidebar/_group.html.haml

@@ -36,7 +36,7 @@
                   %span
                     = _('Activity')
 
-            = render_if_exists 'groups/sidebar/security_dashboard'
+            = render_if_exists 'groups/sidebar/security_dashboard' # EE-specific
 
             - if group_sidebar_link?(:contribution_analytics)
               = nav_link(path: 'analytics#show') do

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

@@ -51,6 +51,9 @@
       = f.label :dashboard, class: 'label-bold' do
         Default dashboard
       = f.select :dashboard, dashboard_choices, {}, class: 'form-control'
+
+    = render_if_exists 'profiles/preferences/group_overview_selector', f: f # EE-specific
+
     .form-group
       = f.label :project_view, class: 'label-bold' do
         Project overview content