diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-07 17:18:11 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-07 17:18:11 +0300 |
| commit | 96e8c6b7ed3f8caf63ca2ac52f844d414479801b (patch) | |
| tree | 3106dc6a556e15c77a2be9e2ff5b3506720e3293 | |
| parent | 1405d28cf780735c4c06f70c13e317600ef3875c (diff) | |
| download | gitlab-ce-96e8c6b7ed3f8caf63ca2ac52f844d414479801b.tar.gz | |
Fix dashboard lost if comment on commit
| -rw-r--r-- | app/helpers/events_helper.rb | 8 | ||||
| -rw-r--r-- | app/views/events/event/_note.html.haml | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 7155036eeed..80dcc127e7e 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -83,4 +83,12 @@ module EventsHelper render "events/event_push", event: event end end + + def event_note_target_path(event) + if event.note? && event.note_commit? + project_commit_path(event.project, event.note_target) + else + url_for([event.project, event.note_target]) + end + end end diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml index 81b8ff9bf24..458a00d94cd 100644 --- a/app/views/events/event/_note.html.haml +++ b/app/views/events/event/_note.html.haml @@ -10,7 +10,7 @@ %strong #{event.note_target_type} ##{truncate event.note_target_id} - else - = link_to [event.project, event.note_target] do + = link_to event_note_target_path(event) do %strong #{event.note_target_type} ##{truncate event.note_target_id} |