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
5f18efdd
Commit
5f18efdd
authored
Mar 05, 2021
by
Yogi
Committed by
Olena Horal-Koretska
Mar 05, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move to btn-confirm from btn-success in the groups directory
parent
37d862c3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
7 deletions
+12
-7
app/views/groups/_home_panel.html.haml
app/views/groups/_home_panel.html.haml
+2
-2
app/views/groups/_import_group_from_another_instance_panel.html.haml
...roups/_import_group_from_another_instance_panel.html.haml
+1
-1
app/views/groups/_import_group_from_file_panel.html.haml
app/views/groups/_import_group_from_file_panel.html.haml
+2
-2
app/views/groups/_new_group_fields.html.haml
app/views/groups/_new_group_fields.html.haml
+1
-1
app/views/groups/projects.html.haml
app/views/groups/projects.html.haml
+1
-1
changelogs/unreleased/btn-confirm-group.yml
changelogs/unreleased/btn-confirm-group.yml
+5
-0
No files found.
app/views/groups/_home_panel.html.haml
View file @
5f18efdd
...
...
@@ -27,10 +27,10 @@
.js-vue-notification-dropdown
{
data:
{
disabled:
emails_disabled
.
to_s
,
dropdown_items:
notification_dropdown_items
(
@notification_setting
).
to_json
,
notification_level:
@notification_setting
.
level
,
help_page_path:
help_page_path
(
'user/profile/notifications'
),
group_id:
@group
.
id
,
container_class:
'gl-mr-3 gl-mt-3 gl-vertical-align-top'
}
}
-
if
can_create_subgroups
.gl-px-2.gl-sm-w-auto.gl-w-full
=
link_to
_
(
"New subgroup"
),
new_group_path
(
parent_id:
@group
.
id
),
class:
"btn btn-
success btn-md gl-button btn-success
-secondary gl-mt-3 gl-sm-w-auto gl-w-full"
,
data:
{
qa_selector:
'new_subgroup_button'
}
=
link_to
_
(
"New subgroup"
),
new_group_path
(
parent_id:
@group
.
id
),
class:
"btn btn-
confirm btn-md gl-button btn-confirm
-secondary gl-mt-3 gl-sm-w-auto gl-w-full"
,
data:
{
qa_selector:
'new_subgroup_button'
}
-
if
can_create_projects
.gl-px-2.gl-sm-w-auto.gl-w-full
=
link_to
_
(
"New project"
),
new_project_path
(
namespace_id:
@group
.
id
),
class:
"btn btn-
success
btn-md gl-button gl-mt-3 gl-sm-w-auto gl-w-full"
,
data:
{
qa_selector:
'new_project_button'
}
=
link_to
_
(
"New project"
),
new_project_path
(
namespace_id:
@group
.
id
),
class:
"btn btn-
confirm
btn-md gl-button gl-mt-3 gl-sm-w-auto gl-w-full"
,
data:
{
qa_selector:
'new_project_button'
}
-
if
@group
.
description
.
present?
.group-home-desc.mt-1
...
...
app/views/groups/_import_group_from_another_instance_panel.html.haml
View file @
5f18efdd
...
...
@@ -29,4 +29,4 @@
title:
s_
(
'GroupsNew|Please fill in your personal access token.'
),
id:
'import_gitlab_token'
.gl-border-gray-100.gl-border-solid.gl-border-1.gl-bg-gray-10.gl-p-5
=
f
.
submit
s_
(
'GroupsNew|Connect instance'
),
class:
'btn gl-button btn-
success
'
=
f
.
submit
s_
(
'GroupsNew|Connect instance'
),
class:
'btn gl-button btn-
confirm
'
app/views/groups/_import_group_from_file_panel.html.haml
View file @
5f18efdd
...
...
@@ -43,6 +43,6 @@
-
import_export_link_start
=
'<a href="%{url}" target="_blank">'
.
html_safe
%
{
url:
help_page_path
(
'user/group/settings/import_export'
)
}
=
s_
(
'GroupsNew|To import a group, navigate to the group settings for the GitLab source instance, %{link_start}generate an export file%{link_end}, and upload it here.'
).
html_safe
%
{
link_start:
import_export_link_start
,
link_end:
'</a>'
.
html_safe
}
.gl-mt-3
=
render
'shared/file_picker_button'
,
f:
f
,
field: :file
,
help_text:
nil
,
classes:
'gl-button btn-
success
-secondary gl-mr-2'
=
render
'shared/file_picker_button'
,
f:
f
,
field: :file
,
help_text:
nil
,
classes:
'gl-button btn-
confirm
-secondary gl-mr-2'
.gl-border-gray-100.gl-border-solid.gl-border-1.gl-bg-gray-10.gl-p-5
=
f
.
submit
_
(
'Import'
),
class:
'btn gl-button btn-
success
'
=
f
.
submit
_
(
'Import'
),
class:
'btn gl-button btn-
confirm
'
app/views/groups/_new_group_fields.html.haml
View file @
5f18efdd
...
...
@@ -18,5 +18,5 @@
=
render_if_exists
'shared/groups/invite_members'
.row
.form-actions.col-sm-12
=
f
.
submit
_
(
'Create group'
),
class:
"btn gl-button btn-
success
"
=
f
.
submit
_
(
'Create group'
),
class:
"btn gl-button btn-
confirm
"
=
link_to
_
(
'Cancel'
),
dashboard_groups_path
,
class:
'btn gl-button btn-default btn-cancel'
app/views/groups/projects.html.haml
View file @
5f18efdd
...
...
@@ -7,7 +7,7 @@
projects:
-
if
can?
current_user
,
:admin_group
,
@group
.controls
=
link_to
new_project_path
(
namespace_id:
@group
.
id
),
class:
"btn gl-button btn-sm btn-
success
"
do
=
link_to
new_project_path
(
namespace_id:
@group
.
id
),
class:
"btn gl-button btn-sm btn-
confirm
"
do
New project
%ul
.projects-list.content-list.group-settings-projects
-
@projects
.
each
do
|
project
|
...
...
changelogs/unreleased/btn-confirm-group.yml
0 → 100644
View file @
5f18efdd
---
title
:
Move to btn-confirm from btn-success in groups directory
merge_request
:
55282
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