diff options
| author | Phil Hughes <me@iamphill.com> | 2016-02-23 14:15:30 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-02-23 14:15:30 +0000 |
| commit | 1cd263130da00075f38c6a2a5aa3917f7a2f9ef5 (patch) | |
| tree | 877bc28a2adc652363db1f23c27c841d6c2b63e4 | |
| parent | 25a1f9ffb251f2f08510151af3c19e61fb6dc940 (diff) | |
| download | gitlab-ce-mr-prefix-activity-view.tar.gz | |
Removed un-used variablesmr-prefix-activity-view
| -rw-r--r-- | app/helpers/events_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_merge_request.html.haml | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 127cd8f1812..e5fcaab9551 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -155,8 +155,6 @@ module EventsHelper def event_note_title_html(event) if event.note_target - link_prefix = event.note_target.class.reference_prefix - if event.note_commit? link_to( namespace_project_commit_path(event.project.namespace, event.project, diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml index 866b0f302ef..f415244e953 100644 --- a/app/views/projects/merge_requests/_merge_request.html.haml +++ b/app/views/projects/merge_requests/_merge_request.html.haml @@ -48,7 +48,7 @@ = note_count .merge-request-info - \#{merge_request.to_reference} · + #{merge_request.to_reference} · opened #{time_ago_with_tooltip(merge_request.created_at, placement: 'bottom')} by #{link_to_member(@project, merge_request.author, avatar: false)} - if merge_request.target_project.default_branch != merge_request.target_branch |