summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-02-17 18:32:10 +0000
committerRémy Coutable <remy@rymai.me>2017-02-17 18:32:10 +0000
commitb43cb21ddec69711d256c00bab95b7459820960e (patch)
tree9e950e0716d6b2eb42afdd0ed3af03982e0c08d8 /lib
parent668dfa02329a94cdf5f811ef3eca1ba5389066bc (diff)
parent7362fd6fdf4704314acbe9760a329ffe23337af0 (diff)
downloadgitlab-ce-b43cb21ddec69711d256c00bab95b7459820960e.tar.gz
Merge branch '26379-iid-param' into 'master'
add a :iid param to the IssuableFinder Closes #26379 See merge request !9222
Diffstat (limited to 'lib')
-rw-r--r--lib/api/v3/issues.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/v3/issues.rb b/lib/api/v3/issues.rb
index 081d45165e8..ba5b6fdbe52 100644
--- a/lib/api/v3/issues.rb
+++ b/lib/api/v3/issues.rb
@@ -16,7 +16,8 @@ module API
labels = args.delete(:labels)
args[:label_name] = labels if match_all_labels
- args[:search] = "#{Issue.reference_prefix}#{args.delete(:iid)}" if args.key?(:iid)
+ # IssuesFinder expects iids
+ args[:iids] = args.delete(:iid) if args.key?(:iid)
issues = IssuesFinder.new(current_user, args).execute.inc_notes_with_associations