diff options
| author | Phil Hughes <me@iamphill.com> | 2016-11-24 11:32:59 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-11-24 11:32:59 +0000 |
| commit | 8c4f4afd6dd6d382aab2d6b992b6ffe3e60f91af (patch) | |
| tree | 37d3ff76dc31e7fcfa63eb8c2f54c9d84eb9b88a /app/helpers/events_helper.rb | |
| parent | 03a235783f697572fe201332cb82746401a01daf (diff) | |
| parent | 3e44ed3e2bf75bb14a2d8b0466b3d92afd0ea067 (diff) | |
| download | gitlab-ce-autocomplete-space-prefix.tar.gz | |
Merge branch 'master' into autocomplete-space-prefixautocomplete-space-prefix
Diffstat (limited to 'app/helpers/events_helper.rb')
| -rw-r--r-- | app/helpers/events_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 00e64076408..f1a0b929d82 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -86,7 +86,7 @@ module EventsHelper elsif event.merge_request? namespace_project_merge_request_url(event.project.namespace, event.project, event.merge_request) - elsif event.note? && event.commit_note? + elsif event.commit_note? namespace_project_commit_url(event.project.namespace, event.project, event.note_target) elsif event.note? @@ -127,7 +127,7 @@ module EventsHelper end def event_note_target_path(event) - if event.note? && event.commit_note? + if event.commit_note? namespace_project_commit_path(event.project.namespace, event.project, event.note_target, |