diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-05 16:06:31 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-05 16:06:31 +0000 |
| commit | 4c6898bdcf0bff6a0a3b288215271be4e916b27c (patch) | |
| tree | 13db382a777a55c8220fcbdd85ebf5bf4cedeb03 /lib/api/merge_requests.rb | |
| parent | ae9b771797cceee76c18376910519e9e71628acc (diff) | |
| parent | 063e285e6a8c26a95809873fb32fefc54fe9bdb6 (diff) | |
| download | gitlab-ce-36860-migrate-issues-author.tar.gz | |
Merge branch 'master' into '36860-migrate-issues-author'36860-migrate-issues-author
# Conflicts:
# db/schema.rb
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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 |