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
d230b367
Commit
d230b367
authored
Oct 22, 2019
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed protected branches flash styling
parent
462f7942
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
app/views/projects/protected_branches/shared/_branches_list.html.haml
...ojects/protected_branches/shared/_branches_list.html.haml
+1
-2
changelogs/unreleased/ph-fixProtectedBranchesFlash.yml
changelogs/unreleased/ph-fixProtectedBranchesFlash.yml
+5
-0
No files found.
app/views/projects/protected_branches/shared/_branches_list.html.haml
View file @
d230b367
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
%p
.settings-message.text-center
%p
.settings-message.text-center
=
s_
(
"ProtectedBranch|There are currently no protected branches, protect a branch with the form above."
)
=
s_
(
"ProtectedBranch|There are currently no protected branches, protect a branch with the form above."
)
-
else
-
else
.flash-container
%table
.table.table-bordered
%table
.table.table-bordered
%colgroup
%colgroup
%col
{
width:
"20%"
}
%col
{
width:
"20%"
}
...
@@ -27,8 +28,6 @@
...
@@ -27,8 +28,6 @@
-
if
can_admin_project
-
if
can_admin_project
%th
%th
%tbody
%tbody
%tr
%td
.flash-container
{
colspan:
5
}
=
yield
=
yield
=
paginate
@protected_branches
,
theme:
'gitlab'
=
paginate
@protected_branches
,
theme:
'gitlab'
changelogs/unreleased/ph-fixProtectedBranchesFlash.yml
0 → 100644
View file @
d230b367
---
title
:
Fixed protected branches flash styling
merge_request
:
author
:
type
:
fixed
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