diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2019-05-14 08:38:39 +0000 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2019-05-14 08:38:39 +0000 |
| commit | ddb90d88a08de7748245400ca70b2700fb054017 (patch) | |
| tree | b86c19c90e20729ba087caed0cfacad80ef8fca0 /lib | |
| parent | deccdd7252579be022282797f28d16b415b3ca80 (diff) | |
| parent | eb88ca76469539431b7f06592f177a77d5738612 (diff) | |
| download | gitlab-ce-ddb90d88a08de7748245400ca70b2700fb054017.tar.gz | |
Merge branch '55583-rename-method-conflicts' into 'master'
Rename methods that conflict in Rails 5.2
Closes #55583
See merge request gitlab-org/gitlab-ce!28281
Diffstat (limited to 'lib')
| -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 |