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
2cd896dd
Commit
2cd896dd
authored
Dec 11, 2020
by
Alexander Turinske
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert group settings expand button to gl-button
parent
df79193d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+4
-4
ee/app/views/shared/groups/_max_pages_size_setting.html.haml
ee/app/views/shared/groups/_max_pages_size_setting.html.haml
+1
-1
ee/changelogs/unreleased/231124-convert-expand-button-to-gl.yml
...ngelogs/unreleased/231124-convert-expand-button-to-gl.yml
+5
-0
No files found.
app/views/groups/edit.html.haml
View file @
2cd896dd
...
...
@@ -8,7 +8,7 @@
.settings-header
%h4
.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
{
role:
'button'
}
=
_
(
'Naming, visibility'
)
%button
.btn.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.
js-settings-toggle
{
type:
'button'
}
=
_
(
'Collapse'
)
%p
=
_
(
'Update your group name, description, avatar, and visibility.'
)
...
...
@@ -19,7 +19,7 @@
.settings-header
%h4
.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
{
role:
'button'
}
=
_
(
'Permissions, LFS, 2FA'
)
%button
.btn.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.
js-settings-toggle
{
type:
'button'
}
=
expanded
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
=
_
(
'Advanced permissions, Large File Storage and Two-Factor authentication settings.'
)
...
...
@@ -32,7 +32,7 @@
.settings-header
%h4
.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
{
role:
'button'
}
=
s_
(
'GroupSettings|Badges'
)
%button
.btn.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.
js-settings-toggle
{
type:
'button'
}
=
expanded
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
=
s_
(
'GroupSettings|Customize your group badges.'
)
...
...
@@ -48,7 +48,7 @@
.settings-header
%h4
.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
{
role:
'button'
}
=
_
(
'Advanced'
)
%button
.btn.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.
js-settings-toggle
{
type:
'button'
}
=
expanded
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
=
_
(
'Perform advanced options such as changing path, transferring, exporting, or removing the group.'
)
...
...
ee/app/views/shared/groups/_max_pages_size_setting.html.haml
View file @
2cd896dd
...
...
@@ -5,7 +5,7 @@
.settings-header
%h4
.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
{
role:
'button'
}
=
_
(
'Pages'
)
%button
.btn.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.
js-settings-toggle
{
type:
'button'
}
=
expanded
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
=
_
(
'Size settings for static websites'
)
...
...
ee/changelogs/unreleased/231124-convert-expand-button-to-gl.yml
0 → 100644
View file @
2cd896dd
---
title
:
Convert group settings expand button to gl-button
merge_request
:
49857
author
:
type
:
other
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