diff options
author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-05-13 07:42:06 +0300 |
---|---|---|
committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-05-13 07:42:06 +0300 |
commit | eb88ca76469539431b7f06592f177a77d5738612 (patch) | |
tree | acfef46fb6d3c3313fa152ece9240ef3570a2ce8 /app/views | |
parent | 74511b049743cf543694bb92a8acd7e7586e533d (diff) |
Rename methods that conflict in Rails 5.2
Adds suffix to enum methods and changes `in_groups` to
`of_groups`
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/events/_event.html.haml | 6 | ||||
-rw-r--r-- | app/views/users/calendar_activities.html.haml | 2 |
2 files changed, 4 insertions, 4 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 diff --git a/app/views/users/calendar_activities.html.haml b/app/views/users/calendar_activities.html.haml index 01acbf8eadd..3191eaa1e2c 100644 --- a/app/views/users/calendar_activities.html.haml +++ b/app/views/users/calendar_activities.html.haml @@ -9,7 +9,7 @@ %i.fa.fa-clock-o = event.created_at.to_time.in_time_zone.strftime('%-I:%M%P') - if event.visible_to_user?(current_user) - - if event.push? + - if event.push_action? #{event.action_name} #{event.ref_type} %strong - commits_path = project_commits_path(event.project, event.ref_name) |