diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2018-09-13 18:01:33 +0300 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2018-09-24 13:43:20 +0300 |
| commit | 8c4399e530e8560321ab805bce426c99fb104d84 (patch) | |
| tree | a8172a20b7b0fcab654343619b7f0cb365f7acfb /app | |
| parent | 76bc9eefbbbfd697e6ae1c6bef35524e2eca5783 (diff) | |
Lint
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/dashboard_helper.rb | 12 | ||||
| -rw-r--r-- | app/models/user_callout.rb | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb index 7a0e2135b94..267ccbd8c5d 100644 --- a/app/helpers/dashboard_helper.rb +++ b/app/helpers/dashboard_helper.rb @@ -22,17 +22,17 @@ module DashboardHelper def controller_action_to_child_dashboards(controller = controller_name, action = action_name) case "#{controller}##{action}" when 'projects#index', 'root#index', 'projects#starred', 'projects#trending' - ['projects', 'stars'] + %w(projects, 'stars) when 'dashboard#activity' - ['starred_project_activity', 'project_activity'] + %w(starred_project_activity, 'project_activity) when 'groups#index' - ['groups'] + %w(groups) when 'todos#index' - ['todos'] + %w(todos) when 'dashboard#issues' - ['issues'] + %w(issues) when 'dashboard#merge_requests' - ['merge_requests'] + %w(merge_requests) else [] end diff --git a/app/models/user_callout.rb b/app/models/user_callout.rb index 15a2155b0c5..2c0e8659fc1 100644 --- a/app/models/user_callout.rb +++ b/app/models/user_callout.rb @@ -6,7 +6,8 @@ class UserCallout < ActiveRecord::Base enum feature_name: { gke_cluster_integration: 1, gcp_signup_offer: 2, - gold_trial: 3 + cluster_security_warning: 3, + gold_trial: 4 } validates :user, presence: true |