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
c4117b90
Commit
c4117b90
authored
Mar 05, 2021
by
Yogi
Committed by
David O'Regan
Mar 05, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move to btn-confirm from btn-success in admin/users directory
parent
1d17649c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
app/views/admin/users/_form.html.haml
app/views/admin/users/_form.html.haml
+4
-4
app/views/admin/users/_users.html.haml
app/views/admin/users/_users.html.haml
+1
-1
changelogs/unreleased/btn-confirm-admin-users.yml
changelogs/unreleased/btn-confirm-admin-users.yml
+5
-0
No files found.
app/views/admin/users/_form.html.haml
View file @
c4117b90
...
@@ -87,8 +87,8 @@
...
@@ -87,8 +87,8 @@
.form-actions
.form-actions
-
if
@user
.
new_record?
-
if
@user
.
new_record?
=
f
.
submit
'Create user'
,
class:
"btn gl-button btn-
success
"
=
f
.
submit
'Create user'
,
class:
"btn gl-button btn-
confirm
"
=
link_to
'Cancel'
,
admin_users_path
,
class:
"gl-button btn btn-cancel"
=
link_to
'Cancel'
,
admin_users_path
,
class:
"gl-button btn btn-
default btn-
cancel"
-
else
-
else
=
f
.
submit
'Save changes'
,
class:
"btn gl-button btn-
success
"
=
f
.
submit
'Save changes'
,
class:
"btn gl-button btn-
confirm
"
=
link_to
'Cancel'
,
admin_user_path
(
@user
),
class:
"
btn gl-button
btn-cancel"
=
link_to
'Cancel'
,
admin_user_path
(
@user
),
class:
"
gl-button btn btn-default
btn-cancel"
app/views/admin/users/_users.html.haml
View file @
c4117b90
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
.nav-controls
.nav-controls
=
render_if_exists
'admin/users/admin_email_users'
=
render_if_exists
'admin/users/admin_email_users'
=
render_if_exists
'admin/users/admin_export_user_permissions'
=
render_if_exists
'admin/users/admin_export_user_permissions'
=
link_to
s_
(
'AdminUsers|New user'
),
new_admin_user_path
,
class:
'btn gl-button btn-
success
btn-search float-right'
=
link_to
s_
(
'AdminUsers|New user'
),
new_admin_user_path
,
class:
'btn gl-button btn-
confirm
btn-search float-right'
.filtered-search-block.row-content-block.border-top-0
.filtered-search-block.row-content-block.border-top-0
=
form_tag
admin_users_path
,
method: :get
do
=
form_tag
admin_users_path
,
method: :get
do
...
...
changelogs/unreleased/btn-confirm-admin-users.yml
0 → 100644
View file @
c4117b90
---
title
:
Move to btn-confirm from btn-success in admin/users directory
merge_request
:
55276
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