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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
84141298
Commit
84141298
authored
Apr 30, 2018
by
Constance Okoghenun
Committed by
Filipa Lacerda
Apr 30, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed inconsistent protected branch pill baseline
parent
2f7b71df
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
app/views/projects/branches/_branch.html.haml
app/views/projects/branches/_branch.html.haml
+5
-6
changelogs/unreleased/fix-inconsistent-protected-branch-pill-baseline.yml
...eased/fix-inconsistent-protected-branch-pill-baseline.yml
+5
-0
No files found.
app/views/projects/branches/_branch.html.haml
View file @
84141298
...
...
@@ -8,18 +8,17 @@
%li
{
class:
"branch-item js-branch-#{branch.name}"
}
.branch-info
.branch-title
=
link_to
project_tree_path
(
@project
,
branch
.
name
),
class:
'item-title str-truncated-100 ref-name'
do
=
sprite_icon
(
'fork'
,
size:
12
)
=
sprite_icon
(
'fork'
,
size:
12
)
=
link_to
project_tree_path
(
@project
,
branch
.
name
),
class:
'item-title str-truncated-100 ref-name prepend-left-8'
do
=
branch
.
name
-
if
branch
.
name
==
@repository
.
root_ref
%span
.label.label-primary
default
%span
.label.label-primary
.prepend-left-5
default
-
elsif
merged
%span
.label.label-info.has-tooltip
{
title:
s_
(
'
Branches
|
Merged
into
%
{
default_branch
}
'
)
%
{
default_branch:
@repository
.
root_ref
}
}
%span
.label.label-info.has-tooltip
.prepend-left-5
{
title:
s_
(
'
Branches
|
Merged
into
%
{
default_branch
}
'
)
%
{
default_branch:
@repository
.
root_ref
}
}
=
s_
(
'Branches|merged'
)
-
if
protected_branch?
(
@project
,
branch
)
%span
.label.label-success
%span
.label.label-success
.prepend-left-5
=
s_
(
'Branches|protected'
)
.block-truncated
...
...
changelogs/unreleased/fix-inconsistent-protected-branch-pill-baseline.yml
0 → 100644
View file @
84141298
---
title
:
Fixed inconsistent protected branch pill baseline
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