Commit c01760b2 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'fix-issue-board-promotion-spacing-ee' into 'master'

Add padding to Promotion on issues board (Fixes #11735)

Closes #11735

See merge request gitlab-org/gitlab-ee!13387
parents f801f83f 2e0678bd
- return unless @project - return unless @project
.board-promotion-state .board-promotion-state.p-3
.svg-container.center .svg-container.center
= custom_icon('icon_issue_board') = custom_icon('icon_issue_board')
%p %p
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
- if Gitlab::CurrentSettings.should_check_namespace_plan? - if Gitlab::CurrentSettings.should_check_namespace_plan?
- namespace = @project&.namespace || @group - namespace = @project&.namespace || @group
- if can?(current_user, :admin_namespace, namespace) - if can?(current_user, :admin_namespace, namespace)
= link_to _('Upgrade your plan'), upgrade_plan_url, class: 'btn btn-primary' = link_to _('Upgrade your plan'), upgrade_plan_url, class: 'btn btn-primary btn-block'
- elsif namespace.is_a?(Group) - elsif namespace.is_a?(Group)
%p= _('Contact an owner of group %{namespace_name} to upgrade the plan.') % { namespace_name: namespace.name } %p= _('Contact an owner of group %{namespace_name} to upgrade the plan.') % { namespace_name: namespace.name }
- else - else
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
%p= _('Contact owner %{link_start}%{owner_name}%{link_end} to upgrade the plan.').html_safe % { owner_name: owner.name, link_start: link_start, link_end: '</a>'.html_safe } %p= _('Contact owner %{link_start}%{owner_name}%{link_end} to upgrade the plan.').html_safe % { owner_name: owner.name, link_start: link_start, link_end: '</a>'.html_safe }
- elsif current_user&.admin? - elsif current_user&.admin?
- if License.current&.expired? - if License.current&.expired?
= link_to (!short_form ? _('Buy GitLab Enterprise Edition') : _('Buy EE')), ::EE::SUBSCRIPTIONS_PLANS_URL, class: 'btn btn-primary' = link_to (!short_form ? _('Buy GitLab Enterprise Edition') : _('Buy EE')), ::EE::SUBSCRIPTIONS_PLANS_URL, class: 'btn btn-primary btn-block'
- else - else
= link_to _('Start GitLab Ultimate trial'), new_trial_url, class: 'btn btn-primary' = link_to _('Start GitLab Ultimate trial'), new_trial_url, class: 'btn btn-primary btn-block'
- else - else
%p= _('Contact your Administrator to upgrade your license.') %p= _('Contact your Administrator to upgrade your license.')
---
title: Fixed padding for promotion state in Boards
merge_request: 13387
author: Ben McCormick
type: fixed
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