Resolve CE/EE diffs in zero_authorized_projects

Part of single codebase changes.
This commit is contained in:
Luke Bennett 2019-05-11 05:16:19 +01:00
parent 825b2bdafd
commit bd4652753b
No known key found for this signature in database
GPG key ID: 402ED51FB5D306C2
3 changed files with 20 additions and 5 deletions

View file

@ -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

View file

@ -1,4 +1,4 @@
.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 @@
Welcome to GitLab Welcome to GitLab
%p.blank-state-text %p.blank-state-text
Code, test, and deploy together Code, test, and deploy together
.blank-state-row
%div{ class: ('column-large' if has_start_trial?) }
- if current_user.admin? - if current_user.admin?
= render "blank_state_admin_welcome" = render "blank_state_admin_welcome"
- else - else
= render "blank_state_welcome" = render "blank_state_welcome"
- if has_start_trial?
.column-small
= render_if_exists "blank_state_ee_trial"

View file

@ -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