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
1ec2cb05
Commit
1ec2cb05
authored
Apr 09, 2021
by
Yogi
Committed by
Jose Ivan Vargas
Apr 09, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move to btn-confirm from btn-success in licenses directory
parent
0ce04776
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
4 deletions
+9
-4
changelogs/unreleased/btn-confirm-licenses.yml
changelogs/unreleased/btn-confirm-licenses.yml
+5
-0
ee/app/views/admin/licenses/_upload_buy_license.html.haml
ee/app/views/admin/licenses/_upload_buy_license.html.haml
+1
-1
ee/app/views/admin/licenses/missing.html.haml
ee/app/views/admin/licenses/missing.html.haml
+2
-2
ee/app/views/admin/licenses/show.html.haml
ee/app/views/admin/licenses/show.html.haml
+1
-1
No files found.
changelogs/unreleased/btn-confirm-licenses.yml
0 → 100644
View file @
1ec2cb05
---
title
:
Move to btn-confirm from btn-success in licenses directory
merge_request
:
58024
author
:
Yogi (@yo)
type
:
changed
ee/app/views/admin/licenses/_upload_buy_license.html.haml
View file @
1ec2cb05
=
link_to
_
(
'Buy License'
),
::
EE
::
SUBSCRIPTIONS_PLANS_URL
,
target:
'_blank'
,
rel:
'noopener noreferrer nofollow'
,
class:
'gl-button btn btn-
success btn-inverted
float-right btn-buy-license'
=
link_to
_
(
'Buy License'
),
::
EE
::
SUBSCRIPTIONS_PLANS_URL
,
target:
'_blank'
,
rel:
'noopener noreferrer nofollow'
,
class:
'gl-button btn btn-
confirm-secondary
float-right btn-buy-license'
=
link_to
_
(
'Upload New License'
),
new_admin_license_path
,
class:
'gl-button btn btn-default float-right btn-upload-license gl-mr-3'
,
data:
{
qa_selector:
'license_upload_link'
}
=
link_to
_
(
'Upload New License'
),
new_admin_license_path
,
class:
'gl-button btn btn-default float-right btn-upload-license gl-mr-3'
,
data:
{
qa_selector:
'license_upload_link'
}
ee/app/views/admin/licenses/missing.html.haml
View file @
1ec2cb05
...
@@ -17,9 +17,9 @@
...
@@ -17,9 +17,9 @@
=
s_
(
'License|You do not have a license.'
)
=
s_
(
'License|You do not have a license.'
)
-
if
License
.
eligible_for_trial?
-
if
License
.
eligible_for_trial?
%p
.trial-description
=
s_
(
'License|You can start a free trial of GitLab Ultimate without any obligation or payment details.'
)
%p
.trial-description
=
s_
(
'License|You can start a free trial of GitLab Ultimate without any obligation or payment details.'
)
=
link_to
'Start free trial'
,
new_trial_url
,
target:
'_blank'
,
class:
"gl-button btn btn-
success
btn-start-trial gl-mt-3"
=
link_to
'Start free trial'
,
new_trial_url
,
target:
'_blank'
,
class:
"gl-button btn btn-
confirm
btn-start-trial gl-mt-3"
-
else
-
else
%p
.trial-description
%p
.trial-description
=
s_
(
'License|Your free trial of GitLab Ultimate expired on %{trial_ends_on}.'
).
html_safe
%
{
trial_ends_on:
License
.
trial_ends_on
}
=
s_
(
'License|Your free trial of GitLab Ultimate expired on %{trial_ends_on}.'
).
html_safe
%
{
trial_ends_on:
License
.
trial_ends_on
}
=
s_
(
'License|You can restore access to the Gold features at any time by upgrading.'
)
=
s_
(
'License|You can restore access to the Gold features at any time by upgrading.'
)
=
link_to
s_
(
'License|Buy license'
),
::
EE
::
SUBSCRIPTIONS_PLANS_URL
,
target:
'_blank'
,
rel:
'noopener noreferrer nofollow'
,
class:
"gl-button btn btn-
success
btn-buy-license"
=
link_to
s_
(
'License|Buy license'
),
::
EE
::
SUBSCRIPTIONS_PLANS_URL
,
target:
'_blank'
,
rel:
'noopener noreferrer nofollow'
,
class:
"gl-button btn btn-
confirm
btn-buy-license"
ee/app/views/admin/licenses/show.html.haml
View file @
1ec2cb05
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
-
if
@license
&
.
trial?
-
if
@license
&
.
trial?
=
render
'upload_buy_license'
=
render
'upload_buy_license'
-
else
-
else
=
link_to
_
(
'Upload New License'
),
new_admin_license_path
,
class:
'gl-button btn btn-
success
float-right'
,
data:
{
qa_selector:
'license_upload_link'
}
=
link_to
_
(
'Upload New License'
),
new_admin_license_path
,
class:
'gl-button btn btn-
confirm
float-right'
,
data:
{
qa_selector:
'license_upload_link'
}
%hr
%hr
...
...
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