kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Lint

This commit is contained in:
Luke Bennett 2018-09-13 16:01:33 +01:00
parent 76bc9eefbb
commit 8c4399e530
No known key found for this signature in database
GPG Key ID: 402ED51FB5D306C2
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/helpers/dashboard_helper.rb
View File

@ -22,17 +22,17 @@ module DashboardHelper
def controller_action_to_child_dashboards(controller = controller_name, action = action_name) def controller_action_to_child_dashboards(controller = controller_name, action = action_name)
case "#{controller}##{action}" case "#{controller}##{action}"
when 'projects#index', 'root#index', 'projects#starred', 'projects#trending' when 'projects#index', 'root#index', 'projects#starred', 'projects#trending'
['projects', 'stars'] %w(projects, 'stars)
when 'dashboard#activity' when 'dashboard#activity'
['starred_project_activity', 'project_activity'] %w(starred_project_activity, 'project_activity)
when 'groups#index' when 'groups#index'
['groups'] %w(groups)
when 'todos#index' when 'todos#index'
['todos'] %w(todos)
when 'dashboard#issues' when 'dashboard#issues'
['issues'] %w(issues)
when 'dashboard#merge_requests' when 'dashboard#merge_requests'
['merge_requests'] %w(merge_requests)
else else
[] []
end end

3
app/models/user_callout.rb
View File

@ -6,7 +6,8 @@ class UserCallout < ActiveRecord::Base
enum feature_name: { enum feature_name: {
gke_cluster_integration: 1, gke_cluster_integration: 1,
gcp_signup_offer: 2, gcp_signup_offer: 2,
gold_trial: 3 cluster_security_warning: 3,
gold_trial: 4
} }
validates :user, presence: true validates :user, presence: true