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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
afc5b711
Commit
afc5b711
authored
Jul 26, 2014
by
Matthew McMillion
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix missing links and incorrect display of issue numbers for notes, comments, and merge requests
parent
cb0d63b9
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
5 deletions
+11
-5
app/helpers/events_helper.rb
app/helpers/events_helper.rb
+6
-0
app/views/events/_event_issue.atom.haml
app/views/events/_event_issue.atom.haml
+2
-2
app/views/events/_event_merge_request.atom.haml
app/views/events/_event_merge_request.atom.haml
+1
-1
app/views/events/_event_note.atom.haml
app/views/events/_event_note.atom.haml
+2
-2
No files found.
app/helpers/events_helper.rb
View file @
afc5b711
...
...
@@ -52,6 +52,8 @@ module EventsHelper
"
#{
event
.
author_name
}
#{
event
.
push_action_name
}
#{
event
.
ref_type
}
#{
event
.
ref_name
}
at
#{
event
.
project_name
}
"
elsif
event
.
membership_changed?
"
#{
event
.
author_name
}
#{
event
.
action_name
}
#{
event
.
project_name
}
"
elsif
event
.
note?
&&
event
.
note_commit?
"
#{
event
.
author_name
}
commented on
#{
event
.
note_target_type
}
#{
event
.
note_short_commit_id
}
at
#{
event
.
project_name
}
"
elsif
event
.
note?
"
#{
event
.
author_name
}
commented on
#{
event
.
note_target_type
}
#
#{
truncate
event
.
note_target_iid
}
at
#{
event
.
project_name
}
"
else
...
...
@@ -64,6 +66,8 @@ module EventsHelper
project_issue_url
(
event
.
project
,
event
.
issue
)
elsif
event
.
merge_request?
project_merge_request_url
(
event
.
project
,
event
.
merge_request
)
elsif
event
.
note?
&&
event
.
note_commit?
project_commit_url
(
event
.
project
,
event
.
note_target
)
elsif
event
.
note?
if
event
.
note_target
if
event
.
note_commit?
...
...
@@ -94,6 +98,8 @@ module EventsHelper
render
"events/event_push"
,
event:
event
elsif
event
.
merge_request?
render
"events/event_merge_request"
,
merge_request:
event
.
merge_request
elsif
event
.
push?
render
"events/event_push"
,
event:
event
elsif
event
.
note?
render
"events/event_note"
,
note:
event
.
note
end
...
...
app/views/events/_event_issue.atom.haml
View file @
afc5b711
%div
{
:xmlns
=>
"http://www.w3.org/1999/xhtml"
}
%p
=
markdown
issue
.
description
%div
{
xmlns:
"http://www.w3.org/1999/xhtml"
}
=
markdown
issue
.
description
app/views/events/_event_merge_request.atom.haml
View file @
afc5b711
%div
{
xmlns:
"http://www.w3.org/1999/xhtml"
}
%p
=
markdown
merge_request
.
description
=
markdown
merge_request
.
description
app/views/events/_event_note.atom.haml
View file @
afc5b711
%div
{
:xmlns
=>
"http://www.w3.org/1999/xhtml"
}
%p
=
markdown
note
.
note
%div
{
xmlns:
"http://www.w3.org/1999/xhtml"
}
=
markdown
note
.
note
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