diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-07-19 09:52:54 +0100 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-07-19 09:52:54 +0100 |
| commit | fb511b66d689dd4dda0dff10759344f39e81ef8a (patch) | |
| tree | 612955e40636e0623e497f8036f55b8f2de27acc /lib/api/entities.rb | |
| parent | 820c37716b6190db6c09e1be1a836df5554db518 (diff) | |
| parent | 98eccfc44c597ba14939659ca3b9150197129961 (diff) | |
| download | gitlab-ce-fb511b66d689dd4dda0dff10759344f39e81ef8a.tar.gz | |
Merge remote-tracking branch 'origin/master' into 45443-unable-to-save-user-profile-update-with-safari
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 b256c33c631..3f3a95ea8e6 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -701,7 +701,7 @@ module API expose :system?, as: :system expose :noteable_id, :noteable_type - expose :position, if: ->(note, options) { note.diff_note? } do |note| + expose :position, if: ->(note, options) { note.is_a?(DiffNote) } do |note| note.position.to_h end |