Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6199360e
Commit
6199360e
authored
Nov 09, 2020
by
Jackie Fraser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change "Contact Sales to upgrade" link on License
parent
1c386aaa
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
ee/app/views/admin/licenses/_info.html.haml
ee/app/views/admin/licenses/_info.html.haml
+2
-2
ee/spec/views/admin/licenses/_info.html.haml_spec.rb
ee/spec/views/admin/licenses/_info.html.haml_spec.rb
+5
-5
locale/gitlab.pot
locale/gitlab.pot
+3
-3
No files found.
ee/app/views/admin/licenses/_info.html.haml
View file @
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
...
...
ee/spec/views/admin/licenses/_info.html.haml_spec.rb
View file @
6199360e
...
@@ -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
...
...
locale/gitlab.pot
View file @
6199360e
...
@@ -7126,6 +7126,9 @@ msgstr ""
...
@@ -7126,6 +7126,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 ""
...
@@ -13780,9 +13783,6 @@ msgstr ""
...
@@ -13780,9 +13783,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 ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment