diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-10-05 15:40:19 +0000 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-10-05 15:40:19 +0000 |
commit | f90fc922dbcb8db5f8aadc6eee3d5a8c8c414375 (patch) | |
tree | 042200ae796fda60a90c25cdcec793c443fe3be6 /app/helpers | |
parent | 393331b40bc9044b658896028869d29eed126a71 (diff) | |
parent | 1b16ef307f9206afd0abdb4dcf7faa45a5daafd8 (diff) | |
download | gitlab-ce-f90fc922dbcb8db5f8aadc6eee3d5a8c8c414375.tar.gz |
Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into 'master'
CE port Resolve "Promote starting a GitLab.com trial"
See merge request gitlab-org/gitlab-ce!21551
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/dashboard_helper.rb | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb index 463f4145bdd..33c53021c11 100644 --- a/app/helpers/dashboard_helper.rb +++ b/app/helpers/dashboard_helper.rb @@ -21,6 +21,29 @@ module DashboardHelper links.any? { |link| dashboard_nav_link?(link) } end + def controller_action_to_child_dashboards(controller = controller_name, action = action_name) + case "#{controller}##{action}" + when 'projects#index', 'root#index', 'projects#starred', 'projects#trending' + %w(projects stars) + when 'dashboard#activity' + %w(starred_project_activity project_activity) + when 'groups#index' + %w(groups) + when 'todos#index' + %w(todos) + when 'dashboard#issues' + %w(issues) + when 'dashboard#merge_requests' + %w(merge_requests) + else + [] + end + end + + def user_default_dashboard?(user = current_user) + controller_action_to_child_dashboards.any? {|dashboard| dashboard == user.dashboard } + end + private def get_dashboard_nav_links |