Commit fe62abdc authored by Kushal Pandya's avatar Kushal Pandya

Merge branch...

Merge branch '263143-introduce-an-easier-way-to-contact-sales-about-upgrading-a-self-hosted-instance-plan-add-a' into 'master'

Change "Contact Sales to upgrade" link on License

See merge request gitlab-org/gitlab!47214
parents 98443467 6199360e
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
%strong= @license.plan.capitalize %strong= @license.plan.capitalize
- unless @license.ultimate? - unless @license.ultimate?
= ' - ' = ' - '
= link_to _('How to upgrade'), = link_to _('Contact Sales to upgrade'),
help_page_path('subscriptions/self_managed/index.md', anchor: 'upgrade-your-subscription-tier'), 'https://about.gitlab.com/sales/?inapplink=contactsalessm',
class: 'inline-link', class: 'inline-link',
target: :_blank, target: :_blank,
rel: :noreferrer rel: :noreferrer
......
...@@ -11,22 +11,22 @@ RSpec.describe 'admin/licenses/_info' do ...@@ -11,22 +11,22 @@ RSpec.describe 'admin/licenses/_info' do
context 'when plan can be upgraded' do context 'when plan can be upgraded' do
let(:license) { create(:license, plan: License::STARTER_PLAN) } let(:license) { create(:license, plan: License::STARTER_PLAN) }
it 'shows "How to upgrade" link' do it 'shows "Contact Sales to upgrade" link' do
render render
expect(rendered).to have_content('Plan: Starter - How to upgrade') expect(rendered).to have_content('Plan: Starter - Contact Sales to upgrade')
expect(rendered).to have_link('How to upgrade') expect(rendered).to have_link('Contact Sales to upgrade')
end end
end end
context 'when plan can not be upgraded' do context 'when plan can not be upgraded' do
let(:license) { create(:license, plan: License::ULTIMATE_PLAN) } let(:license) { create(:license, plan: License::ULTIMATE_PLAN) }
it 'does not show "How to upgrade" link' do it 'does not show "Contact Sales to upgrade" link' do
render render
expect(rendered).to have_content('Plan: Ultimate') expect(rendered).to have_content('Plan: Ultimate')
expect(rendered).not_to have_link('How to upgrade') expect(rendered).not_to have_link('Contact Sales to upgrade')
end end
end end
end end
......
...@@ -7129,6 +7129,9 @@ msgstr "" ...@@ -7129,6 +7129,9 @@ msgstr ""
msgid "Consistency guarantee method" msgid "Consistency guarantee method"
msgstr "" msgstr ""
msgid "Contact Sales to upgrade"
msgstr ""
msgid "Contact sales to upgrade" msgid "Contact sales to upgrade"
msgstr "" msgstr ""
...@@ -13789,9 +13792,6 @@ msgstr "" ...@@ -13789,9 +13792,6 @@ msgstr ""
msgid "How many users will be evaluating the trial?" msgid "How many users will be evaluating the trial?"
msgstr "" msgstr ""
msgid "How to upgrade"
msgstr ""
msgid "However, you are already a member of this %{member_source}. Sign in using a different account to accept the invitation." msgid "However, you are already a member of this %{member_source}. Sign in using a different account to accept the invitation."
msgstr "" msgstr ""
......
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