Commit 8e9dd622 authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files

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
parents 60876192 f9c5c7ae
......@@ -33,12 +33,10 @@ def user
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
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment