Commit 061dc361 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '14694-buy-additional-minutes' into 'master'

Moves Buy additional minutes button to the pipelines tab

Closes #14694

See merge request gitlab-org/gitlab-ee!16443
parents a4eabca0 04306eee
...@@ -15,9 +15,6 @@ ...@@ -15,9 +15,6 @@
%li.nav-item %li.nav-item
%a.nav-link#storage-quota{ data: { toggle: "tab", action: '#storage-quota-tab' }, href: '#storage-quota-tab', 'aria-controls': '#storage-quota-tab', 'aria-selected': false } %a.nav-link#storage-quota{ data: { toggle: "tab", action: '#storage-quota-tab' }, href: '#storage-quota-tab', 'aria-controls': '#storage-quota-tab', 'aria-selected': false }
= s_('UsageQuota|Storage') = s_('UsageQuota|Storage')
.nav-controls
= link_to s_('UsageQuota|Buy additional minutes'), EE::SUBSCRIPTIONS_PLANS_URL, target: '_blank', class: 'btn btn-inverted btn-success float-right' if ::Gitlab.com?
.tab-content .tab-content
.tab-pane#pipelines-quota-tab .tab-pane#pipelines-quota-tab
= render "namespaces/pipelines_quota/list", = render "namespaces/pipelines_quota/list",
......
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
- projects = locals.fetch(:projects) - projects = locals.fetch(:projects)
.pipeline-quota.container-fluid .pipeline-quota.container-fluid
.row
.col-sm-6.offset-sm-6
= link_to s_('UsageQuota|Buy additional minutes'), EE::SUBSCRIPTIONS_PLANS_URL, target: '_blank', class: 'btn btn-inverted btn-success float-right' if ::Gitlab.com?
.row .row
.col-sm-6 .col-sm-6
%strong %strong
......
---
title: Moves Buy additional minutes button to the pipelines tab
merge_request: 16443
author:
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