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 /lib/api/entities.rb | |
| parent | 74511b049743cf543694bb92a8acd7e7586e533d (diff) | |
| download | gitlab-ce-55583-rename-method-conflicts.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 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 90ed24a2ded..296688ba25b 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -878,7 +878,7 @@ module API expose :push_event_payload, as: :push_data, using: PushEventPayload, - if: -> (event, _) { event.push? } + if: -> (event, _) { event.push_action? } expose :author_username do |event, options| event.author&.username |