From bd4652753b6be1c2d4d74bd9e5599949974185aa Mon Sep 17 00:00:00 2001
From: Luke Bennett <lbennett@gitlab.com>
Date: Sat, 11 May 2019 05:16:19 +0100
Subject: [PATCH] Resolve CE/EE diffs in zero_authorized_projects

Part of single codebase changes.
---
 app/helpers/dashboard_helper.rb                   |  4 ++++
 .../projects/_zero_authorized_projects.html.haml  | 15 ++++++++++-----
 spec/helpers/dashboard_helper_spec.rb             |  6 ++++++
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb
index d90ef8903a7..42732eb93dd 100644
--- a/app/helpers/dashboard_helper.rb
+++ b/app/helpers/dashboard_helper.rb
@@ -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
diff --git a/app/views/dashboard/projects/_zero_authorized_projects.html.haml b/app/views/dashboard/projects/_zero_authorized_projects.html.haml
index 18a82feb189..8933c5d7227 100644
--- a/app/views/dashboard/projects/_zero_authorized_projects.html.haml
+++ b/app/views/dashboard/projects/_zero_authorized_projects.html.haml
@@ -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? }" }
     .container.section-body
       .row
@@ -7,7 +7,12 @@
             Welcome to GitLab
           %p.blank-state-text
             Code, test, and deploy together
-        - if current_user.admin?
-          = render "blank_state_admin_welcome"
-        - else
-          = render "blank_state_welcome"
+        .blank-state-row
+          %div{ class: ('column-large' if has_start_trial?) }
+            - if current_user.admin?
+              = render "blank_state_admin_welcome"
+            - else
+              = render "blank_state_welcome"
+          - if has_start_trial?
+            .column-small
+              = render_if_exists "blank_state_ee_trial"
diff --git a/spec/helpers/dashboard_helper_spec.rb b/spec/helpers/dashboard_helper_spec.rb
index 7ba24ba2956..023238ee0ae 100644
--- a/spec/helpers/dashboard_helper_spec.rb
+++ b/spec/helpers/dashboard_helper_spec.rb
@@ -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