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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
a1025236
Commit
a1025236
authored
May 11, 2019
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve CE/EE diffs in zero_authorized_projects
Part of single codebase changes.
parent
20c4f75b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
48 additions
and
7 deletions
+48
-7
app/helpers/dashboard_helper.rb
app/helpers/dashboard_helper.rb
+4
-0
app/views/dashboard/projects/_zero_authorized_projects.html.haml
...ws/dashboard/projects/_zero_authorized_projects.html.haml
+5
-7
ee/app/helpers/ee/dashboard_helper.rb
ee/app/helpers/ee/dashboard_helper.rb
+4
-0
ee/spec/helpers/ee/dashboard_helper_spec.rb
ee/spec/helpers/ee/dashboard_helper_spec.rb
+29
-0
spec/helpers/dashboard_helper_spec.rb
spec/helpers/dashboard_helper_spec.rb
+6
-0
No files found.
app/helpers/dashboard_helper.rb
View file @
a1025236
...
...
@@ -21,6 +21,10 @@ module DashboardHelper
links
.
any?
{
|
link
|
dashboard_nav_link?
(
link
)
}
end
def
has_start_trial?
false
end
private
def
get_dashboard_nav_links
...
...
app/views/dashboard/projects/_zero_authorized_projects.html.haml
View file @
a1025236
-
admin_without_ee_license
=
!
current_license
&&
current_user
.
admin?
.blank-state-parent-container
{
class:
(
'has-start-trial-container'
if
admin_without_ee_license
)
}
.section-container.section-welcome
.blank-state-parent-container
{
class:
(
'has-start-trial-container'
if
has_start_trial?
)
}
.section-container.section-welcome
{
class:
"#{ 'section-admin-welcome' if current_user.admin? }"
}
.container.section-body
.row
.blank-state-welcome
...
...
@@ -10,11 +8,11 @@
%p
.blank-state-text
Code, test, and deploy together
.blank-state-row
%div
{
class:
(
'column-large'
if
admin_without_ee_license
)
}
%div
{
class:
(
'column-large'
if
has_start_trial?
)
}
-
if
current_user
.
admin?
=
render
"blank_state_admin_welcome"
-
else
=
render
"blank_state_welcome"
-
if
admin_without_ee_license
-
if
has_start_trial?
.column-small
=
render
"blank_state_ee_trial"
=
render
_if_exists
"blank_state_ee_trial"
ee/app/helpers/ee/dashboard_helper.rb
View file @
a1025236
...
...
@@ -24,5 +24,9 @@ module EE
def
user_default_dashboard?
(
user
)
controller_action_to_child_dashboards
.
any?
{
|
dashboard
|
dashboard
==
user
.
dashboard
}
end
def
has_start_trial?
!
current_license
&&
current_user
.
admin?
end
end
end
ee/spec/helpers/ee/dashboard_helper_spec.rb
0 → 100644
View file @
a1025236
# frozen_string_literal: true
require
'spec_helper'
describe
DashboardHelper
,
type: :helper
do
describe
'.has_start_trial?'
do
using
RSpec
::
Parameterized
::
TableSyntax
where
(
:has_license
,
:current_user
,
:output
)
do
false
|
:admin
|
true
false
|
:user
|
false
true
|
:admin
|
false
true
|
:user
|
false
end
with_them
do
let
(
:user
)
{
create
(
current_user
)
}
let
(
:license
)
{
has_license
&&
create
(
:license
)
}
subject
{
helper
.
has_start_trial?
}
before
do
allow
(
helper
).
to
receive
(
:current_user
).
and_return
(
user
)
allow
(
helper
).
to
receive
(
:current_license
).
and_return
(
license
)
end
it
{
is_expected
.
to
eq
(
output
)
}
end
end
end
spec/helpers/dashboard_helper_spec.rb
View file @
a1025236
...
...
@@ -21,4 +21,10 @@ describe DashboardHelper do
expect
(
helper
.
dashboard_nav_links
).
not_to
include
(
:activity
,
:milestones
)
end
end
describe
'.has_start_trial?'
do
subject
{
helper
.
has_start_trial?
}
it
{
is_expected
.
to
eq
(
false
)
}
end
end
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