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
0907820e
Commit
0907820e
authored
Mar 05, 2021
by
Yogi
Committed by
Denys Mishunov
Mar 05, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move to btn-confirm from btn-success in admin/groups directory
parent
ab3055aa
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
4 deletions
+9
-4
app/views/admin/groups/_form.html.haml
app/views/admin/groups/_form.html.haml
+2
-2
app/views/admin/groups/index.html.haml
app/views/admin/groups/index.html.haml
+1
-1
app/views/admin/groups/show.html.haml
app/views/admin/groups/show.html.haml
+1
-1
changelogs/unreleased/btn-confirm-admin-groups.yml
changelogs/unreleased/btn-confirm-admin-groups.yml
+5
-0
No files found.
app/views/admin/groups/_form.html.haml
View file @
0907820e
...
@@ -30,10 +30,10 @@
...
@@ -30,10 +30,10 @@
.gl-alert-body
.gl-alert-body
=
render
'shared/group_tips'
=
render
'shared/group_tips'
.form-actions
.form-actions
=
f
.
submit
_
(
'Create group'
),
class:
"gl-button btn btn-
success
"
=
f
.
submit
_
(
'Create group'
),
class:
"gl-button btn btn-
confirm
"
=
link_to
_
(
'Cancel'
),
admin_groups_path
,
class:
"gl-button btn btn-default btn-cancel"
=
link_to
_
(
'Cancel'
),
admin_groups_path
,
class:
"gl-button btn btn-default btn-cancel"
-
else
-
else
.form-actions
.form-actions
=
f
.
submit
_
(
'Save changes'
),
class:
"gl-button btn btn-
success
"
,
data:
{
qa_selector:
'save_changes_button'
}
=
f
.
submit
_
(
'Save changes'
),
class:
"gl-button btn btn-
confirm
"
,
data:
{
qa_selector:
'save_changes_button'
}
=
link_to
_
(
'Cancel'
),
admin_group_path
(
@group
),
class:
"gl-button btn btn-cancel"
=
link_to
_
(
'Cancel'
),
admin_group_path
(
@group
),
class:
"gl-button btn btn-cancel"
app/views/admin/groups/index.html.haml
View file @
0907820e
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
=
search_field_tag
:name
,
project_name
,
class:
"form-control search-text-input js-search-input"
,
autofocus:
true
,
spellcheck:
false
,
placeholder:
'Search by name'
,
data:
{
qa_selector:
'group_search_field'
}
=
search_field_tag
:name
,
project_name
,
class:
"form-control search-text-input js-search-input"
,
autofocus:
true
,
spellcheck:
false
,
placeholder:
'Search by name'
,
data:
{
qa_selector:
'group_search_field'
}
=
sprite_icon
(
'search'
,
css_class:
'search-icon'
)
=
sprite_icon
(
'search'
,
css_class:
'search-icon'
)
=
render
"shared/groups/dropdown"
,
options_hash:
admin_groups_sort_options_hash
=
render
"shared/groups/dropdown"
,
options_hash:
admin_groups_sort_options_hash
=
link_to
new_admin_group_path
,
class:
"gl-button btn btn-
success
"
do
=
link_to
new_admin_group_path
,
class:
"gl-button btn btn-
confirm
"
do
=
_
(
'New group'
)
=
_
(
'New group'
)
%ul
.content-list
%ul
.content-list
=
render
@groups
=
render
@groups
...
...
app/views/admin/groups/show.html.haml
View file @
0907820e
...
@@ -117,7 +117,7 @@
...
@@ -117,7 +117,7 @@
.gl-mt-3
.gl-mt-3
=
select_tag
:access_level
,
options_for_select
(
@group
.
access_level_roles
),
class:
"project-access-select select2"
=
select_tag
:access_level
,
options_for_select
(
@group
.
access_level_roles
),
class:
"project-access-select select2"
%hr
%hr
=
button_tag
_
(
'Add users to group'
),
class:
"gl-button btn btn-
success
"
=
button_tag
_
(
'Add users to group'
),
class:
"gl-button btn btn-
confirm
"
=
render
'shared/members/requests'
,
membership_source:
@group
,
group:
@group
,
requesters:
@requesters
,
force_mobile_view:
true
=
render
'shared/members/requests'
,
membership_source:
@group
,
group:
@group
,
requesters:
@requesters
,
force_mobile_view:
true
.card
.card
...
...
changelogs/unreleased/btn-confirm-admin-groups.yml
0 → 100644
View file @
0907820e
---
title
:
Move to btn-confirm from btn-success in admin/groups directory
merge_request
:
55268
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