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
2ac71699
Commit
2ac71699
authored
Mar 22, 2021
by
Yogi
Committed by
Miguel Rincon
Mar 22, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move from btn-success to btn-confirm in users directory
parent
cd33b34e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
app/views/users/terms/index.html.haml
app/views/users/terms/index.html.haml
+2
-2
changelogs/unreleased/btn-confirm-users.yml
changelogs/unreleased/btn-confirm-users.yml
+5
-0
No files found.
app/views/users/terms/index.html.haml
View file @
2ac71699
...
@@ -6,11 +6,11 @@
...
@@ -6,11 +6,11 @@
.card-footer.footer-block.clearfix
.card-footer.footer-block.clearfix
-
if
can?
(
current_user
,
:accept_terms
,
@term
)
-
if
can?
(
current_user
,
:accept_terms
,
@term
)
.float-right
.float-right
=
button_to
accept_term_path
(
@term
,
redirect_params
),
class:
'gl-button btn btn-
success
gl-ml-3'
,
data:
{
qa_selector:
'accept_terms_button'
}
do
=
button_to
accept_term_path
(
@term
,
redirect_params
),
class:
'gl-button btn btn-
confirm
gl-ml-3'
,
data:
{
qa_selector:
'accept_terms_button'
}
do
=
_
(
'Accept terms'
)
=
_
(
'Accept terms'
)
-
else
-
else
.float-right
.float-right
=
link_to
root_path
,
class:
'gl-button btn btn-
success
gl-ml-3'
do
=
link_to
root_path
,
class:
'gl-button btn btn-
confirm
gl-ml-3'
do
=
_
(
'Continue'
)
=
_
(
'Continue'
)
-
if
can?
(
current_user
,
:decline_terms
,
@term
)
-
if
can?
(
current_user
,
:decline_terms
,
@term
)
.float-right
.float-right
...
...
changelogs/unreleased/btn-confirm-users.yml
0 → 100644
View file @
2ac71699
---
title
:
Move from btn-success to btn-confirm in users directory
merge_request
:
56945
author
:
Yogi (@yo)
type
:
changed
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