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
e528866a
Commit
e528866a
authored
Nov 14, 2018
by
Martin Wortschack
Committed by
Phil Hughes
Nov 14, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Activity Feed - Missing padding in event note when a branch is deleted"
parent
c9343960
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
app/views/events/event/_push.html.haml
app/views/events/event/_push.html.haml
+2
-2
changelogs/unreleased/54002-activity-feed-missing-padding-in-event-note-when-a-branch-is-deleted.yml
...issing-padding-in-event-note-when-a-branch-is-deleted.yml
+5
-0
No files found.
app/views/events/event/_push.html.haml
View file @
e528866a
...
@@ -7,10 +7,10 @@
...
@@ -7,10 +7,10 @@
.event-title.d-flex.flex-wrap
.event-title.d-flex.flex-wrap
=
inline_event_icon
(
event
)
=
inline_event_icon
(
event
)
%span
.event-type.d-inline-block.append-right-4.pushed
#{
event
.
action_name
}
#{
event
.
ref_type
}
%span
.event-type.d-inline-block.append-right-4.pushed
#{
event
.
action_name
}
#{
event
.
ref_type
}
%span
%span
.append-right-4
-
commits_link
=
project_commits_path
(
project
,
event
.
ref_name
)
-
commits_link
=
project_commits_path
(
project
,
event
.
ref_name
)
-
should_link
=
event
.
tag?
?
project
.
repository
.
tag_exists?
(
event
.
ref_name
)
:
project
.
repository
.
branch_exists?
(
event
.
ref_name
)
-
should_link
=
event
.
tag?
?
project
.
repository
.
tag_exists?
(
event
.
ref_name
)
:
project
.
repository
.
branch_exists?
(
event
.
ref_name
)
=
link_to_if
should_link
,
event
.
ref_name
,
commits_link
,
class:
'ref-name
append-right-4
'
=
link_to_if
should_link
,
event
.
ref_name
,
commits_link
,
class:
'ref-name'
=
render
"events/event_scope"
,
event:
event
=
render
"events/event_scope"
,
event:
event
...
...
changelogs/unreleased/54002-activity-feed-missing-padding-in-event-note-when-a-branch-is-deleted.yml
0 → 100644
View file @
e528866a
---
title
:
Adds margin after a deleted branch name in the activity feed.
merge_request
:
23038
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