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
Léo-Paul Géneau
gitlab-ce
Commits
529feb4b
Commit
529feb4b
authored
Jun 22, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add comment title to rss feed
parent
96f3a88c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
7 deletions
+9
-7
app/helpers/events_helper.rb
app/helpers/events_helper.rb
+6
-4
app/models/event.rb
app/models/event.rb
+1
-1
app/views/notes/_discussion.html.haml
app/views/notes/_discussion.html.haml
+1
-1
app/views/notes/_note.html.haml
app/views/notes/_note.html.haml
+1
-1
No files found.
app/helpers/events_helper.rb
View file @
529feb4b
...
...
@@ -45,13 +45,15 @@ module EventsHelper
def
event_feed_title
(
event
)
if
event
.
issue?
"
#{
event
.
author_name
}
#{
event
.
action_name
}
issue #
#{
event
.
target_id
}
:
#{
event
.
issue_title
}
at
#{
event
.
project
.
name
}
"
"
#{
event
.
author_name
}
#{
event
.
action_name
}
issue #
#{
event
.
target_id
}
:
#{
event
.
issue_title
}
at
#{
event
.
project
_
name
}
"
elsif
event
.
merge_request?
"
#{
event
.
author_name
}
#{
event
.
action_name
}
MR #
#{
event
.
target_id
}
:
#{
event
.
merge_request_title
}
at
#{
event
.
project
.
name
}
"
"
#{
event
.
author_name
}
#{
event
.
action_name
}
MR #
#{
event
.
target_id
}
:
#{
event
.
merge_request_title
}
at
#{
event
.
project
_
name
}
"
elsif
event
.
push?
"
#{
event
.
author_name
}
#{
event
.
push_action_name
}
#{
event
.
ref_type
}
#{
event
.
ref_name
}
at
#{
event
.
project
.
name
}
"
"
#{
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
}
"
"
#{
event
.
author_name
}
#{
event
.
action_name
}
#{
event
.
project_name
}
"
elsif
event
.
note?
"
#{
event
.
author_name
}
commented on
#{
event
.
note_target_type
}
#
#{
truncate
event
.
note_target_id
}
at
#{
event
.
project_name
}
"
else
""
end
...
...
app/models/event.rb
View file @
529feb4b
...
...
@@ -68,7 +68,7 @@ class Event < ActiveRecord::Base
def
project_name
if
project
project
.
name
project
.
name
_with_namespace
else
"(deleted project)"
end
...
...
app/views/notes/_discussion.html.haml
View file @
529feb4b
...
...
@@ -8,7 +8,7 @@
=
link_to
"javascript:;"
,
class:
"js-details-target turn-off js-toggler-target"
do
%i
.icon-eye-open
Show discussion
=
image_tag
gravatar_icon
(
note
.
author
.
email
),
class:
"avatar s32"
=
image_tag
gravatar_icon
(
note
.
author
_
email
),
class:
"avatar s32"
%div
=
link_to_member
(
@project
,
note
.
author
,
avatar:
false
)
-
if
note
.
for_merge_request?
...
...
app/views/notes/_note.html.haml
View file @
529feb4b
...
...
@@ -8,7 +8,7 @@
-
if
(
note
.
author_id
==
current_user
.
id
)
||
can?
(
current_user
,
:admin_note
,
@project
)
=
link_to
project_note_path
(
@project
,
note
),
title:
"Remove comment"
,
method: :delete
,
confirm:
'Are you sure you want to remove comment?'
,
remote:
true
,
class:
"danger js-note-delete"
do
%i
.icon-trash.cred
=
image_tag
gravatar_icon
(
note
.
author
.
email
),
class:
"avatar s32"
=
image_tag
gravatar_icon
(
note
.
author
_
email
),
class:
"avatar s32"
=
link_to_member
(
@project
,
note
.
author
,
avatar:
false
)
%span
.note-last-update
=
time_ago_in_words
(
note
.
updated_at
)
...
...
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