diff options
| author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-05-12 23:42:06 -0500 |
|---|---|---|
| committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-05-12 23:42:06 -0500 |
| commit | eb88ca76469539431b7f06592f177a77d5738612 (patch) | |
| tree | acfef46fb6d3c3313fa152ece9240ef3570a2ce8 /app/views/users/calendar_activities.html.haml | |
| parent | 74511b049743cf543694bb92a8acd7e7586e533d (diff) | |
| download | gitlab-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/users/calendar_activities.html.haml')
| -rw-r--r-- | app/views/users/calendar_activities.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
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) |