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
c58a4ea8
Commit
c58a4ea8
authored
Sep 14, 2018
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Lint
parent
2ab3e57c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/helpers/dashboard_helper.rb
app/helpers/dashboard_helper.rb
+3
-3
ee/app/views/shared/_gold_trial_callout.html.haml
ee/app/views/shared/_gold_trial_callout.html.haml
+1
-1
No files found.
app/helpers/dashboard_helper.rb
View file @
c58a4ea8
...
@@ -22,9 +22,9 @@ module DashboardHelper
...
@@ -22,9 +22,9 @@ 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'
%w(projects
, '
stars)
%w(projects
stars)
when
'dashboard#activity'
when
'dashboard#activity'
%w(starred_project_activity
, '
project_activity)
%w(starred_project_activity
project_activity)
when
'groups#index'
when
'groups#index'
%w(groups)
%w(groups)
when
'todos#index'
when
'todos#index'
...
@@ -38,7 +38,7 @@ module DashboardHelper
...
@@ -38,7 +38,7 @@ module DashboardHelper
end
end
end
end
def
is
_default_dashboard?
(
user
=
current_user
)
def
user
_default_dashboard?
(
user
=
current_user
)
controller_action_to_child_dashboards
.
any?
{
|
dashboard
|
dashboard
==
user
.
dashboard
}
controller_action_to_child_dashboards
.
any?
{
|
dashboard
|
dashboard
==
user
.
dashboard
}
end
end
...
...
ee/app/views/shared/_gold_trial_callout.html.haml
View file @
c58a4ea8
-
if
show_gold_trial?
&&
is
_default_dashboard?
-
if
show_gold_trial?
&&
user
_default_dashboard?
.pt-1.d-none.d-md-block
{
class:
container_class
}
.pt-1.d-none.d-md-block
{
class:
container_class
}
.user-callout.promotion-callout.thin-callout.js-gold-trial-callout
{
data:
{
uid:
'trial_callout_dismissed'
,
feature_id:
UserCalloutsHelper
::
GOLD_TRIAL
,
dismiss_endpoint:
user_callouts_path
}
}
.user-callout.promotion-callout.thin-callout.js-gold-trial-callout
{
data:
{
uid:
'trial_callout_dismissed'
,
feature_id:
UserCalloutsHelper
::
GOLD_TRIAL
,
dismiss_endpoint:
user_callouts_path
}
}
.bordered-box.justify-content-left.align-items-center
.bordered-box.justify-content-left.align-items-center
...
...
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