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
aaa3db23
Commit
aaa3db23
authored
Feb 20, 2021
by
yo
Committed by
Yogi
Mar 12, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move from btn-success to btn-confirm
parent
ba8bd0de
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
10 additions
and
10 deletions
+10
-10
app/views/profiles/accounts/show.html.haml
app/views/profiles/accounts/show.html.haml
+1
-1
app/views/profiles/chat_names/new.html.haml
app/views/profiles/chat_names/new.html.haml
+1
-1
app/views/profiles/emails/index.html.haml
app/views/profiles/emails/index.html.haml
+1
-1
app/views/profiles/gpg_keys/_form.html.haml
app/views/profiles/gpg_keys/_form.html.haml
+1
-1
app/views/profiles/keys/_form.html.haml
app/views/profiles/keys/_form.html.haml
+2
-2
app/views/profiles/passwords/edit.html.haml
app/views/profiles/passwords/edit.html.haml
+1
-1
app/views/profiles/passwords/new.html.haml
app/views/profiles/passwords/new.html.haml
+1
-1
app/views/profiles/show.html.haml
app/views/profiles/show.html.haml
+1
-1
app/views/profiles/two_factor_auths/show.html.haml
app/views/profiles/two_factor_auths/show.html.haml
+1
-1
No files found.
app/views/profiles/accounts/show.html.haml
View file @
aaa3db23
...
...
@@ -28,7 +28,7 @@
=
link_to
_
(
'Manage two-factor authentication'
),
profile_two_factor_auth_path
,
class:
'gl-button btn btn-confirm'
-
else
.gl-mb-3
=
link_to
_
(
'Enable two-factor authentication'
),
profile_two_factor_auth_path
,
class:
'gl-button btn btn-
success
'
,
data:
{
qa_selector:
'enable_2fa_button'
}
=
link_to
_
(
'Enable two-factor authentication'
),
profile_two_factor_auth_path
,
class:
'gl-button btn btn-
confirm
'
,
data:
{
qa_selector:
'enable_2fa_button'
}
.col-lg-12
%hr
...
...
app/views/profiles/chat_names/new.html.haml
View file @
aaa3db23
...
...
@@ -8,7 +8,7 @@
.actions
=
form_tag
profile_chat_names_path
,
method: :post
do
=
hidden_field_tag
:token
,
@chat_name_token
.
token
=
submit_tag
_
(
"Authorize"
),
class:
"gl-button btn btn-
success
wide float-left"
=
submit_tag
_
(
"Authorize"
),
class:
"gl-button btn btn-
confirm
wide float-left"
=
form_tag
deny_profile_chat_names_path
,
method: :delete
do
=
hidden_field_tag
:token
,
@chat_name_token
.
token
=
submit_tag
_
(
"Deny"
),
class:
"gl-button btn btn-danger gl-ml-3"
app/views/profiles/emails/index.html.haml
View file @
aaa3db23
...
...
@@ -15,7 +15,7 @@
=
f
.
label
:email
,
_
(
'Email'
),
class:
'label-bold'
=
f
.
text_field
:email
,
class:
'form-control gl-form-input'
,
data:
{
qa_selector:
'email_address_field'
}
.gl-mt-3
=
f
.
submit
_
(
'Add email address'
),
class:
'gl-button btn btn-
success
'
,
data:
{
qa_selector:
'add_email_address_button'
}
=
f
.
submit
_
(
'Add email address'
),
class:
'gl-button btn btn-
confirm
'
,
data:
{
qa_selector:
'add_email_address_button'
}
%hr
%h4
.gl-mt-0
=
_
(
'Linked emails (%{email_count})'
)
%
{
email_count:
@emails
.
load
.
size
+
1
}
...
...
app/views/profiles/gpg_keys/_form.html.haml
View file @
aaa3db23
...
...
@@ -7,4 +7,4 @@
=
f
.
text_area
:key
,
class:
"form-control"
,
rows:
8
,
required:
true
,
placeholder:
_
(
"Don't paste the private part of the GPG key. Paste the public part which begins with '-----BEGIN PGP PUBLIC KEY BLOCK-----'."
)
.gl-mt-3
=
f
.
submit
s_
(
'Profiles|Add key'
),
class:
"gl-button btn btn-
success
"
=
f
.
submit
s_
(
'Profiles|Add key'
),
class:
"gl-button btn btn-
confirm
"
app/views/profiles/keys/_form.html.haml
View file @
aaa3db23
...
...
@@ -21,7 +21,7 @@
%strong
=
_
(
'Oops, are you sure?'
)
%p
=
s_
(
"Profiles|This doesn't look like a public SSH key, are you sure you want to add it? It will be publicly visible."
)
%button
.btn.gl-button.btn-
success
.js-add-ssh-key-validation-confirm-submit
=
_
(
"Yes, add it"
)
%button
.btn.gl-button.btn-
confirm
.js-add-ssh-key-validation-confirm-submit
=
_
(
"Yes, add it"
)
.gl-mt-3
=
f
.
submit
s_
(
'Profiles|Add key'
),
class:
"gl-button btn btn-
success
js-add-ssh-key-validation-original-submit qa-add-key-button"
=
f
.
submit
s_
(
'Profiles|Add key'
),
class:
"gl-button btn btn-
confirm
js-add-ssh-key-validation-original-submit qa-add-key-button"
app/views/profiles/passwords/edit.html.haml
View file @
aaa3db23
...
...
@@ -30,6 +30,6 @@
=
f
.
label
:password_confirmation
,
_
(
'Password confirmation'
),
class:
'label-bold'
=
f
.
password_field
:password_confirmation
,
required:
true
,
class:
'form-control gl-form-input'
,
data:
{
qa_selector:
'confirm_password_field'
}
.gl-mt-3.gl-mb-3
=
f
.
submit
_
(
'Save password'
),
class:
"gl-button btn btn-
success
gl-mr-3"
,
data:
{
qa_selector:
'save_password_button'
}
=
f
.
submit
_
(
'Save password'
),
class:
"gl-button btn btn-
confirm
gl-mr-3"
,
data:
{
qa_selector:
'save_password_button'
}
-
unless
@user
.
password_automatically_set?
=
link_to
_
(
'I forgot my password'
),
reset_profile_password_path
,
method: :put
app/views/profiles/passwords/new.html.haml
View file @
aaa3db23
...
...
@@ -28,4 +28,4 @@
.col-sm-10
=
f
.
password_field
:password_confirmation
,
required:
true
,
class:
'form-control gl-form-input'
.form-actions
=
f
.
submit
_
(
'Set new password'
),
class:
'gl-button btn btn-
success
'
=
f
.
submit
_
(
'Set new password'
),
class:
'gl-button btn btn-
confirm
'
app/views/profiles/show.html.haml
View file @
aaa3db23
...
...
@@ -127,7 +127,7 @@
=
s_
(
"Profiles|Choose to show contributions of private projects on your public profile without any project, repository or organization information"
)
.row.gl-mt-3.gl-mb-3.gl-justify-content-end
.col-lg-8
=
f
.
submit
s_
(
"Profiles|Update profile settings"
),
class:
'gl-button btn btn-
success
'
=
f
.
submit
s_
(
"Profiles|Update profile settings"
),
class:
'gl-button btn btn-
confirm
'
=
link_to
_
(
"Cancel"
),
user_path
(
current_user
),
class:
'gl-button btn btn-cancel'
.modal.modal-profile-crop
{
data:
{
cropper_css_path:
ActionController
::
Base
.
helpers
.
stylesheet_path
(
'lazy_bundles/cropper.css'
)
}
}
...
...
app/views/profiles/two_factor_auths/show.html.haml
View file @
aaa3db23
...
...
@@ -51,7 +51,7 @@
=
label_tag
:pin_code
,
_
(
'Pin code'
),
class:
"label-bold"
=
text_field_tag
:pin_code
,
nil
,
class:
"form-control"
,
required:
true
,
data:
{
qa_selector:
'pin_code_field'
}
.gl-mt-3
=
submit_tag
_
(
'Register with two-factor app'
),
class:
'gl-button btn btn-
success
'
,
data:
{
qa_selector:
'register_2fa_app_button'
}
=
submit_tag
_
(
'Register with two-factor app'
),
class:
'gl-button btn btn-
confirm
'
,
data:
{
qa_selector:
'register_2fa_app_button'
}
%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