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
fa810e4f
Commit
fa810e4f
authored
Feb 14, 2017
by
Jan Christophersen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Links to Branches in Calendar Activity
parent
f802ad37
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
5 deletions
+13
-5
app/views/users/calendar_activities.html.haml
app/views/users/calendar_activities.html.haml
+9
-5
changelogs/unreleased/26287-link-branch-in-calendar-activity.yml
...ogs/unreleased/26287-link-branch-in-calendar-activity.yml
+4
-0
No files found.
app/views/users/calendar_activities.html.haml
View file @
fa810e4f
...
@@ -10,13 +10,17 @@
...
@@ -10,13 +10,17 @@
%i
.fa.fa-clock-o
%i
.fa.fa-clock-o
=
event
.
created_at
.
to_s
(
:time
)
=
event
.
created_at
.
to_s
(
:time
)
-
if
event
.
push?
-
if
event
.
push?
#{
event
.
action_name
}
#{
event
.
ref_type
}
#{
event
.
ref_name
}
#{
event
.
action_name
}
#{
event
.
ref_type
}
%strong
-
commits_path
=
namespace_project_commits_path
(
event
.
project
.
namespace
,
event
.
project
,
event
.
ref_name
)
=
link_to_if
event
.
project
.
repository
.
branch_exists?
(
event
.
ref_name
),
event
.
ref_name
,
commits_path
-
else
-
else
=
event_action_name
(
event
)
=
event_action_name
(
event
)
%strong
-
if
event
.
note?
-
if
event
.
note?
%strong
=
link_to
event
.
note_target
.
to_reference
,
event_note_target_path
(
event
)
=
link_to
event
.
note_target
.
to_reference
,
event_note_target_path
(
event
)
-
elsif
event
.
target
-
elsif
event
.
target
%strong
=
link_to
event
.
target
.
to_reference
,
[
event
.
project
.
namespace
.
becomes
(
Namespace
),
event
.
project
,
event
.
target
]
=
link_to
event
.
target
.
to_reference
,
[
event
.
project
.
namespace
.
becomes
(
Namespace
),
event
.
project
,
event
.
target
]
at
at
%strong
%strong
...
...
changelogs/unreleased/26287-link-branch-in-calendar-activity.yml
0 → 100644
View file @
fa810e4f
---
title
:
Add Links to Branches in Calendar Activity
merge_request
:
9224
author
:
Jan Christophersen
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