diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-24 06:41:56 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-24 06:41:56 +0000 |
commit | 5c23bb1171a22ccb63ba7ba56ecc87e0d6f72666 (patch) | |
tree | 7056c85d618fb00e66efee0afa449b1037e3a16c /app/helpers/events_helper.rb | |
parent | 3d98c1ea0fb7c153eb7c9a3162f2c03d25d8b0f6 (diff) | |
parent | 2e03ccff0297d1cf34f85fc3b4e47431253492af (diff) | |
download | gitlab-ce-5c23bb1171a22ccb63ba7ba56ecc87e0d6f72666.tar.gz |
Merge branch 'bugfix/303/dashboard_feed_ids' into 'master'
Move Event Helper To Use Project-level IDs Instead of Global IDs
This MR fixes issue #303 by updating app/helpers/event_helper.rb to use project-level IDs within the event title as opposed to global IDs (i.e. use target_iid instead of target_id).
This ties the issue and merge request numbers on the feed together with the numbers used throughout the rest of the site.
Diffstat (limited to 'app/helpers/events_helper.rb')
-rw-r--r-- | app/helpers/events_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index d3904e16c11..f0530c74828 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -45,15 +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_iid}: #{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_iid}: #{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}" elsif event.membership_changed? "#{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}" + "#{event.author_name} commented on #{event.note_target_type} ##{truncate event.note_target_iid} at #{event.project_name}" else "" end |