Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
8c4399e5
Commit
8c4399e5
authored
Sep 13, 2018
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Lint
parent
76bc9eef
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
app/helpers/dashboard_helper.rb
app/helpers/dashboard_helper.rb
+6
-6
app/models/user_callout.rb
app/models/user_callout.rb
+2
-1
No files found.
app/helpers/dashboard_helper.rb
View file @
8c4399e5
...
@@ -22,17 +22,17 @@ module DashboardHelper
...
@@ -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
...
...
app/models/user_callout.rb
View file @
8c4399e5
...
@@ -6,7 +6,8 @@ class UserCallout < ActiveRecord::Base
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment