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
01f35637
Commit
01f35637
authored
Feb 18, 2021
by
Alexander Turinske
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update protected branches buttons to pajamas style
- protected branches settings buttons - change template button
parent
0b82f6e2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
app/views/projects/project_templates/_project_fields_form.html.haml
...projects/project_templates/_project_fields_form.html.haml
+1
-1
app/views/projects/protected_branches/shared/_create_protected_branch.html.haml
...tected_branches/shared/_create_protected_branch.html.haml
+1
-1
app/views/projects/protected_branches/shared/_index.html.haml
...views/projects/protected_branches/shared/_index.html.haml
+1
-1
changelogs/unreleased/231064-update-settings-buttons-to-pajamas.yml
.../unreleased/231064-update-settings-buttons-to-pajamas.yml
+5
-0
No files found.
app/views/projects/project_templates/_project_fields_form.html.haml
View file @
01f35637
...
...
@@ -8,5 +8,5 @@
.selected-icon.gl-mr-3
.selected-template
.input-group-append
%button
.btn.btn-default.change-template
{
type:
"button"
}
%button
.btn.
gl-button.
btn-default.change-template
{
type:
"button"
}
=
_
(
'Change template'
)
app/views/projects/protected_branches/shared/_create_protected_branch.html.haml
View file @
01f35637
...
...
@@ -23,4 +23,4 @@
=
yield
:push_access_levels
=
render_if_exists
'projects/protected_branches/ee/code_owner_approval_form'
,
f:
f
.card-footer
=
f
.
submit
s_
(
'ProtectedBranch|Protect'
),
class:
'btn-success btn'
,
disabled:
true
,
data:
{
qa_selector:
'protect_button'
}
=
f
.
submit
s_
(
'ProtectedBranch|Protect'
),
class:
'btn-success
gl-button
btn'
,
disabled:
true
,
data:
{
qa_selector:
'protect_button'
}
app/views/projects/protected_branches/shared/_index.html.haml
View file @
01f35637
...
...
@@ -4,7 +4,7 @@
.settings-header
%h4
Protected branches
%button
.btn.js-settings-toggle.qa-expand-protected-branches
{
type:
'button'
}
%button
.btn.
gl-button.
js-settings-toggle.qa-expand-protected-branches
{
type:
'button'
}
=
expanded
?
'Collapse'
:
'Expand'
%p
Keep stable branches secure, and force developers to use merge requests.
#{
link_to
"What are protected branches?"
,
help_page_path
(
"user/project/protected_branches"
)
}
...
...
changelogs/unreleased/231064-update-settings-buttons-to-pajamas.yml
0 → 100644
View file @
01f35637
---
title
:
Update protected branches buttons to pajamas style
merge_request
:
54612
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