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
d4b700ba
Commit
d4b700ba
authored
Dec 09, 2020
by
Alexander Turinske
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add gl-button style to admin area
- push hooks - missing license
parent
53c990d0
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
ee/app/views/admin/licenses/_upload_trial_license.html.haml
ee/app/views/admin/licenses/_upload_trial_license.html.haml
+1
-1
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
ee/changelogs/unreleased/231160-update-push-hook-buttons.yml
ee/changelogs/unreleased/231160-update-push-hook-buttons.yml
+5
-0
No files found.
ee/app/views/admin/licenses/_upload_trial_license.html.haml
View file @
d4b700ba
...
...
@@ -24,5 +24,5 @@
.card.trial-license-preview.gl-mt-5
=
license_key
.modal-footer.form-actions
%button
.btn.btn-default
{
type:
'button'
,
data:
{
dismiss:
'modal'
}
}
Cancel
%button
.btn.
gl-button.
btn-default
{
type:
'button'
,
data:
{
dismiss:
'modal'
}
}
Cancel
=
f
.
submit
'Install license'
,
class:
'gl-button btn btn-primary'
ee/app/views/admin/push_rules/_merge_request_approvals.html.haml
View file @
d4b700ba
...
...
@@ -3,7 +3,7 @@
.settings-header
%h4
=
_
(
'Merge requests approvals'
)
%button
.btn.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.
js-settings-toggle
{
type:
'button'
}
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
=
_
(
'Settings to prevent self-approval across all projects in the instance. Only an administrator can modify these settings.'
)
...
...
ee/app/views/admin/push_rules/show.html.haml
View file @
d4b700ba
...
...
@@ -6,7 +6,7 @@
.settings-header
%h4
=
_
(
'Push Rules'
)
%button
.btn.js-settings-toggle
{
type:
'button'
}
%button
.btn.
gl-button.
js-settings-toggle
{
type:
'button'
}
=
expanded_by_default?
?
_
(
'Collapse'
)
:
_
(
'Expand'
)
%p
=
_
(
'Rules that define what git pushes are accepted for a project. All newly created projects will use these settings.'
)
...
...
ee/changelogs/unreleased/231160-update-push-hook-buttons.yml
0 → 100644
View file @
d4b700ba
---
title
:
Add gl-button style to admin area
merge_request
:
49610
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