summaryrefslogtreecommitdiff
path: root/app/views/events
diff options
context:
space:
mode:
authorHeinrich Lee Yu <heinrich@gitlab.com>2019-05-12 23:42:06 -0500
committerHeinrich Lee Yu <heinrich@gitlab.com>2019-05-12 23:42:06 -0500
commiteb88ca76469539431b7f06592f177a77d5738612 (patch)
treeacfef46fb6d3c3313fa152ece9240ef3570a2ce8 /app/views/events
parent74511b049743cf543694bb92a8acd7e7586e533d (diff)
downloadgitlab-ce-eb88ca76469539431b7f06592f177a77d5738612.tar.gz
Rename methods that conflict in Rails 5.255583-rename-method-conflicts
Adds suffix to enum methods and changes `in_groups` to `of_groups`
Diffstat (limited to 'app/views/events')
-rw-r--r--app/views/events/_event.html.haml6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index 2fcb1d1fd2b..222175c818a 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -3,11 +3,11 @@
.event-item-timestamp
#{time_ago_with_tooltip(event.created_at)}
- - if event.created_project?
+ - if event.created_project_action?
= render "events/event/created_project", event: event
- - elsif event.push?
+ - elsif event.push_action?
= render "events/event/push", event: event
- - elsif event.commented?
+ - elsif event.commented_action?
= render "events/event/note", event: event
- else
= render "events/event/common", event: event