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
fad5858c
Commit
fad5858c
authored
Jan 20, 2021
by
Yogi
Committed by
Brandon Labuschagne
Jan 20, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply new GitLab UI for buttons in admin settings
parent
a63eef73
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
14 deletions
+19
-14
app/views/admin/application_settings/_external_authorization_service_form.html.haml
...n_settings/_external_authorization_service_form.html.haml
+1
-1
app/views/admin/application_settings/preferences.html.haml
app/views/admin/application_settings/preferences.html.haml
+6
-6
app/views/admin/application_settings/reporting.html.haml
app/views/admin/application_settings/reporting.html.haml
+2
-2
app/views/admin/application_settings/repository.html.haml
app/views/admin/application_settings/repository.html.haml
+5
-5
changelogs/unreleased/yo-gl-button-admin.yml
changelogs/unreleased/yo-gl-button-admin.yml
+5
-0
No files found.
app/views/admin/application_settings/_external_authorization_service_form.html.haml
View file @
fad5858c
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'External authentication'
)
=
_
(
'External authentication'
)
%button
.btn.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.btn-default.
js-settings-toggle
{
type:
'button'
}
=
expanded
?
'Collapse'
:
'Expand'
=
expanded
?
'Collapse'
:
'Expand'
%p
%p
=
_
(
'External Classification Policy Authorization'
)
=
_
(
'External Classification Policy Authorization'
)
...
...
app/views/admin/application_settings/preferences.html.haml
View file @
fad5858c
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Email'
)
=
_
(
'Email'
)
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.
btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%p
=
_
(
'Various email settings.'
)
=
_
(
'Various email settings.'
)
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Help page'
)
=
_
(
'Help page'
)
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.
btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%p
=
_
(
'Help page text and support page url.'
)
=
_
(
'Help page text and support page url.'
)
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Pages'
)
=
_
(
'Pages'
)
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.
btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%p
=
_
(
'Size and domain settings for static websites'
)
=
_
(
'Size and domain settings for static websites'
)
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Real-time features'
)
=
_
(
'Real-time features'
)
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.
btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%p
=
_
(
'Change this value to influence how frequently the GitLab UI polls for updates.'
)
=
_
(
'Change this value to influence how frequently the GitLab UI polls for updates.'
)
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Gitaly'
)
=
_
(
'Gitaly'
)
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.
btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%p
=
_
(
'Configure Gitaly timeouts.'
)
=
_
(
'Configure Gitaly timeouts.'
)
...
@@ -61,7 +61,7 @@
...
@@ -61,7 +61,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Localization'
)
=
_
(
'Localization'
)
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.
btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%p
=
_
(
'Various localization settings.'
)
=
_
(
'Various localization settings.'
)
...
...
app/views/admin/application_settings/reporting.html.haml
View file @
fad5858c
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Spam and Anti-bot Protection'
)
=
_
(
'Spam and Anti-bot Protection'
)
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.
btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%p
-
recaptcha_v2_link_url
=
'https://developers.google.com/recaptcha/docs/versions'
-
recaptcha_v2_link_url
=
'https://developers.google.com/recaptcha/docs/versions'
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Abuse reports'
)
=
_
(
'Abuse reports'
)
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.
btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%p
=
_
(
'Set notification email for abuse reports.'
)
=
_
(
'Set notification email for abuse reports.'
)
...
...
app/views/admin/application_settings/repository.html.haml
View file @
fad5858c
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Default initial branch name'
)
=
_
(
'Default initial branch name'
)
%button
.
gl-button
.js-settings-toggle
{
type:
'button'
}
%button
.
btn.gl-button.btn-default
.js-settings-toggle
{
type:
'button'
}
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%p
=
_
(
'Set the default name of the initial branch when creating new repositories through the user interface.'
)
=
_
(
'Set the default name of the initial branch when creating new repositories through the user interface.'
)
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Repository mirroring'
)
=
_
(
'Repository mirroring'
)
%button
.btn.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.btn-default.
js-settings-toggle
{
type:
'button'
}
=
expanded_by_default?
?
'Collapse'
:
'Expand'
=
expanded_by_default?
?
'Collapse'
:
'Expand'
%p
%p
=
_
(
'Configure repository mirroring.'
)
=
_
(
'Configure repository mirroring.'
)
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Repository storage'
)
=
_
(
'Repository storage'
)
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.
btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%p
=
_
(
'Configure storage path settings.'
)
=
_
(
'Configure storage path settings.'
)
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Repository maintenance'
)
=
_
(
'Repository maintenance'
)
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.
btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%p
=
_
(
'Configure automatic git checks and housekeeping on repositories.'
)
=
_
(
'Configure automatic git checks and housekeeping on repositories.'
)
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Repository static objects'
)
=
_
(
'Repository static objects'
)
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.
btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%p
=
_
(
'Serve repository static objects (e.g. archives, blobs, ...) from an external storage (e.g. a CDN).'
)
=
_
(
'Serve repository static objects (e.g. archives, blobs, ...) from an external storage (e.g. a CDN).'
)
...
...
changelogs/unreleased/yo-gl-button-admin.yml
0 → 100644
View file @
fad5858c
---
title
:
Apply new GitLab UI for buttons in admin settings
merge_request
:
51789
author
:
Yogi (@yo)
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