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
66be56f4
Commit
66be56f4
authored
Apr 19, 2021
by
Ammar Alakkad
Committed by
Enrique Alcántara
Apr 19, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename Cloud License to Subscription
parent
ce051400
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
6 deletions
+3
-6
ee/app/helpers/admin/navbar_helper.rb
ee/app/helpers/admin/navbar_helper.rb
+1
-1
ee/app/views/admin/cloud_licenses/show.html.haml
ee/app/views/admin/cloud_licenses/show.html.haml
+1
-1
ee/spec/helpers/admin/navbar_helper_spec.rb
ee/spec/helpers/admin/navbar_helper_spec.rb
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+0
-3
No files found.
ee/app/helpers/admin/navbar_helper.rb
View file @
66be56f4
...
@@ -7,7 +7,7 @@ module Admin
...
@@ -7,7 +7,7 @@ module Admin
end
end
def
navbar_item_name
def
navbar_item_name
cloud_license_enabled?
?
_
(
'
Cloud License
'
)
:
_
(
'License'
)
cloud_license_enabled?
?
_
(
'
Subscription
'
)
:
_
(
'License'
)
end
end
def
navbar_item_path
def
navbar_item_path
...
...
ee/app/views/admin/cloud_licenses/show.html.haml
View file @
66be56f4
-
page_title
_
(
'
Cloud License
'
)
-
page_title
_
(
'
Subscription
'
)
#js-show-cloud-license-page
{
data:
cloud_license_view_data
}
#js-show-cloud-license-page
{
data:
cloud_license_view_data
}
ee/spec/helpers/admin/navbar_helper_spec.rb
View file @
66be56f4
...
@@ -15,7 +15,7 @@ RSpec.describe Admin::NavbarHelper do
...
@@ -15,7 +15,7 @@ RSpec.describe Admin::NavbarHelper do
end
end
it
'returns the correct navbar item name'
do
it
'returns the correct navbar item name'
do
expect
(
helper
.
navbar_item_name
).
to
eq
(
'
Cloud License
'
)
expect
(
helper
.
navbar_item_name
).
to
eq
(
'
Subscription
'
)
end
end
it
'returns the correct navbar item path'
do
it
'returns the correct navbar item path'
do
...
...
locale/gitlab.pot
View file @
66be56f4
...
@@ -6635,9 +6635,6 @@ msgstr ""
...
@@ -6635,9 +6635,6 @@ msgstr ""
msgid "Closes this %{quick_action_target}."
msgid "Closes this %{quick_action_target}."
msgstr ""
msgstr ""
msgid "Cloud License"
msgstr ""
msgid "CloudLicense|Activate"
msgid "CloudLicense|Activate"
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