diff options
author | Rémy Coutable <remy@rymai.me> | 2017-08-02 10:34:35 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-08-02 10:34:35 +0000 |
commit | 1b117e7f2d8cf4c2793bd2234688ad8739056894 (patch) | |
tree | 38adc0ec83fa4f47c040be6b661d7df38bf6d665 /lib | |
parent | 92bfd5ba3e042734de2e6a4fa0a4e3cf86522617 (diff) | |
parent | 24704acc77ebc85d653fc22d3fe9c7e5eb2a707d (diff) | |
download | gitlab-ce-1b117e7f2d8cf4c2793bd2234688ad8739056894.tar.gz |
Merge branch 'api_project_events_target_iid' into 'master'
Expose target_iid in Events API
See merge request !13247
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 f31fe704e0c..298831a8fdb 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -496,7 +496,7 @@ module API class Event < Grape::Entity expose :title, :project_id, :action_name - expose :target_id, :target_type, :author_id + expose :target_id, :target_iid, :target_type, :author_id expose :data, :target_title expose :created_at expose :note, using: Entities::Note, if: ->(event, options) { event.note? } |