diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-05 10:07:22 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-05 10:07:22 +0000 |
| commit | dd157e458ce0d76fc76e32fe2e5bcbbf945c104e (patch) | |
| tree | bb62d6ca8410cc89ce39e99528e4499dd608481c /lib/api | |
| parent | 6523ba1d5a0d73692eeeb675e17e7a05fa5a0e9f (diff) | |
| parent | 785834cfc098c1b74561c49823e2ac061e7d0269 (diff) | |
| download | gitlab-ce-dd157e458ce0d76fc76e32fe2e5bcbbf945c104e.tar.gz | |
Merge branch 'issue-api-my-reaction' into 'master'
Add my_reaction_emoji param to /issues and /merge_requests API
See merge request !14016
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/issues.rb | 1 | ||||
| -rw-r--r-- | lib/api/merge_requests.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/issues.rb b/lib/api/issues.rb index e4c2c390853..1729df2aad0 100644 --- a/lib/api/issues.rb +++ b/lib/api/issues.rb @@ -36,6 +36,7 @@ module API optional :assignee_id, type: Integer, desc: 'Return issues which are assigned to the user with the given ID' optional :scope, type: String, values: %w[created-by-me assigned-to-me all], desc: 'Return issues for the given scope: `created-by-me`, `assigned-to-me` or `all`' + optional :my_reaction_emoji, type: String, desc: 'Return issues reacted by the authenticated user by the given emoji' use :pagination end diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 7bcbf9f20ff..56d72d511da 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -40,6 +40,7 @@ module API optional :assignee_id, type: Integer, desc: 'Return merge requests which are assigned to the user with the given ID' optional :scope, type: String, values: %w[created-by-me assigned-to-me all], desc: 'Return merge requests for the given scope: `created-by-me`, `assigned-to-me` or `all`' + optional :my_reaction_emoji, type: String, desc: 'Return issues reacted by the authenticated user by the given emoji' use :pagination end end |