diff options
| author | Valery Sizov <valery@gitlab.com> | 2017-05-04 17:22:24 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2017-05-04 17:22:24 +0300 |
| commit | b0a9a7cf5ee670ae07c4a9751d9c6e8bed1063b7 (patch) | |
| tree | 1d7d2f8e02c8ca87a2bed44d86dded599671dfdb /lib | |
| parent | 387c4b2c21a44360386a9b8ce6849e7f1b8a3de9 (diff) | |
| download | gitlab-ce-b0a9a7cf5ee670ae07c4a9751d9c6e8bed1063b7.tar.gz | |
[Multiple issue assignee]: reslving some conflicts
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/v3/issues.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/api/v3/issues.rb b/lib/api/v3/issues.rb index cedbeb0ded0..cb371fdbab8 100644 --- a/lib/api/v3/issues.rb +++ b/lib/api/v3/issues.rb @@ -61,12 +61,8 @@ module API end get do issues = find_issues(scope: 'authored') -<<<<<<< HEAD - present paginate(issues), with: ::API::Entities::Issue, current_user: current_user -======= present paginate(issues), with: ::API::V3::Entities::Issue, current_user: current_user ->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master end end |