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
96d25a4f
Commit
96d25a4f
authored
Jan 25, 2021
by
Yogi
Committed by
David O'Regan
Jan 25, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add btn-default to settings toggle button in push rules
parent
9c798d41
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
changelogs/unreleased/btn-default-push-rules.yml
changelogs/unreleased/btn-default-push-rules.yml
+5
-0
ee/app/views/admin/push_rules/_merge_request_approvals.html.haml
...views/admin/push_rules/_merge_request_approvals.html.haml
+1
-1
ee/app/views/admin/push_rules/show.html.haml
ee/app/views/admin/push_rules/show.html.haml
+1
-1
No files found.
changelogs/unreleased/btn-default-push-rules.yml
0 → 100644
View file @
96d25a4f
---
title
:
Add btn-default to settings toggle button in push rules
merge_request
:
52430
author
:
Yogi (@yo)
type
:
other
ee/app/views/admin/push_rules/_merge_request_approvals.html.haml
View file @
96d25a4f
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Merge request (MR) approvals'
)
=
_
(
'Merge request (MR) approvals'
)
%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
=
_
(
'Regulate approvals by authors/committers. Affects all projects.'
)
=
_
(
'Regulate approvals by authors/committers. Affects all projects.'
)
...
...
ee/app/views/admin/push_rules/show.html.haml
View file @
96d25a4f
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
.settings-header
.settings-header
%h4
%h4
=
_
(
'Push Rules'
)
=
_
(
'Push Rules'
)
%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
=
_
(
'Rules that define what git pushes are accepted for a project. All newly created projects will use these settings.'
)
=
_
(
'Rules that define what git pushes are accepted for a project. All newly created projects will use these settings.'
)
...
...
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