diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-15 07:35:43 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-15 07:35:43 +0000 |
| commit | 8bd1f37c36cf778af4820bd4eeec30e013e80421 (patch) | |
| tree | 6341c8153660849131148847e68785d393b51467 /app | |
| parent | 3c0ab4825346fc1a9cdf3f590bd8e481f5e963f0 (diff) | |
| parent | bd4652753b6be1c2d4d74bd9e5599949974185aa (diff) | |
| download | gitlab-ce-8bd1f37c36cf778af4820bd4eeec30e013e80421.tar.gz | |
Merge branch 'zero-auth-proj-scb' into 'master'
Resolve CE/EE diffs in zero_authorized_projects
See merge request gitlab-org/gitlab-ce!28260
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/dashboard_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/dashboard/projects/_zero_authorized_projects.html.haml | 15 |
2 files changed, 14 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" |