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
51f2d58d
Commit
51f2d58d
authored
Feb 27, 2021
by
Yogi
Committed by
Phil Hughes
Feb 27, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add btn-default class for the settings toggle button
parent
4fe894dc
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
10 deletions
+15
-10
app/views/admin/application_settings/_eks.html.haml
app/views/admin/application_settings/_eks.html.haml
+2
-2
app/views/admin/application_settings/_sourcegraph.html.haml
app/views/admin/application_settings/_sourcegraph.html.haml
+1
-1
app/views/admin/application_settings/general.html.haml
app/views/admin/application_settings/general.html.haml
+5
-5
changelogs/unreleased/btn-default-admin-general-settings.yml
changelogs/unreleased/btn-default-admin-general-settings.yml
+5
-0
ee/app/views/admin/application_settings/_slack.html.haml
ee/app/views/admin/application_settings/_slack.html.haml
+2
-2
No files found.
app/views/admin/application_settings/_eks.html.haml
View file @
51f2d58d
...
@@ -3,8 +3,8 @@
...
@@ -3,8 +3,8 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Amazon EKS'
)
=
_
(
'Amazon EKS'
)
%button
.btn.gl-button.js-settings-toggle
{
type:
'button'
}
%button
.btn.gl-button.
btn-default.
js-settings-toggle
{
type:
'button'
}
=
expanded
?
'Collapse'
:
'Expand'
=
expanded
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%p
=
_
(
'Amazon EKS integration allows you to provision EKS clusters from GitLab.'
)
=
_
(
'Amazon EKS integration allows you to provision EKS clusters from GitLab.'
)
...
...
app/views/admin/application_settings/_sourcegraph.html.haml
View file @
51f2d58d
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Sourcegraph'
)
=
_
(
'Sourcegraph'
)
%button
.btn.btn-default.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.
btn-default.js-settings-toggle
{
type:
'button'
}
=
expanded
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
=
expanded
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%p
-
link_start
=
'<a href="%{url}" target="_blank" rel="noopener noreferrer">'
.
html_safe
%
{
url:
'https://sourcegraph.com/'
}
-
link_start
=
'<a href="%{url}" target="_blank" rel="noopener noreferrer">'
.
html_safe
%
{
url:
'https://sourcegraph.com/'
}
...
...
app/views/admin/application_settings/general.html.haml
View file @
51f2d58d
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Visibility and access controls'
)
=
_
(
'Visibility and access controls'
)
%button
.btn.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 default and restrict visibility levels. Configure import sources and git access protocol.'
)
=
_
(
'Set default and restrict visibility levels. Configure import sources and git access protocol.'
)
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Account and limit'
)
=
_
(
'Account and limit'
)
%button
.btn.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 projects and maximum size limits, session duration, user options, and check feature availability for namespace plan.'
)
=
_
(
'Set projects and maximum size limits, session duration, user options, and check feature availability for namespace plan.'
)
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Diff limits'
)
=
_
(
'Diff limits'
)
%button
.btn.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
=
_
(
'Diff content limits'
)
=
_
(
'Diff content limits'
)
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Sign-up restrictions'
)
=
_
(
'Sign-up restrictions'
)
%button
.btn.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
=
_
(
'Configure the way a user creates a new account.'
)
=
_
(
'Configure the way a user creates a new account.'
)
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Sign-in restrictions'
)
=
_
(
'Sign-in restrictions'
)
%button
.btn.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 requirements for a user to sign-in. Enable mandatory two-factor authentication.'
)
=
_
(
'Set requirements for a user to sign-in. Enable mandatory two-factor authentication.'
)
...
...
changelogs/unreleased/btn-default-admin-general-settings.yml
0 → 100644
View file @
51f2d58d
---
title
:
Add btn-default class for settings toggle button
merge_request
:
54764
author
:
Yogi (@yo)
type
:
changed
ee/app/views/admin/application_settings/_slack.html.haml
View file @
51f2d58d
...
@@ -5,8 +5,8 @@
...
@@ -5,8 +5,8 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Slack application'
)
=
_
(
'Slack application'
)
%button
.btn.gl-button.js-settings-toggle
{
type:
'button'
}
%button
.btn.gl-button.
btn-default.
js-settings-toggle
{
type:
'button'
}
=
expanded
?
'Collapse'
:
'Expand'
=
expanded
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
%p
=
_
(
'Slack integration allows you to interact with GitLab via slash commands in a chat window.'
)
=
_
(
'Slack integration allows you to interact with GitLab via slash commands in a chat window.'
)
.settings-content
.settings-content
...
...
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