Commit 8bd1f37c authored by Phil Hughes's avatar Phil Hughes

Merge branch 'zero-auth-proj-scb' into 'master'

Resolve CE/EE diffs in zero_authorized_projects

See merge request gitlab-org/gitlab-ce!28260
parents 3c0ab482 bd465275
...@@ -21,6 +21,10 @@ module DashboardHelper ...@@ -21,6 +21,10 @@ module DashboardHelper
links.any? { |link| dashboard_nav_link?(link) } links.any? { |link| dashboard_nav_link?(link) }
end end
def has_start_trial?
false
end
private private
def get_dashboard_nav_links def get_dashboard_nav_links
......
.blank-state-parent-container .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? }" } .section-container.section-welcome{ class: "#{ 'section-admin-welcome' if current_user.admin? }" }
.container.section-body .container.section-body
.row .row
...@@ -7,7 +7,12 @@ ...@@ -7,7 +7,12 @@
Welcome to GitLab Welcome to GitLab
%p.blank-state-text %p.blank-state-text
Code, test, and deploy together Code, test, and deploy together
- if current_user.admin? .blank-state-row
= render "blank_state_admin_welcome" %div{ class: ('column-large' if has_start_trial?) }
- else - if current_user.admin?
= render "blank_state_welcome" = render "blank_state_admin_welcome"
- else
= render "blank_state_welcome"
- if has_start_trial?
.column-small
= render_if_exists "blank_state_ee_trial"
...@@ -21,4 +21,10 @@ describe DashboardHelper do ...@@ -21,4 +21,10 @@ describe DashboardHelper do
expect(helper.dashboard_nav_links).not_to include(:activity, :milestones) expect(helper.dashboard_nav_links).not_to include(:activity, :milestones)
end end
end end
describe '.has_start_trial?' do
subject { helper.has_start_trial? }
it { is_expected.to eq(false) }
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment