Merge branch 'master-ce' into scheduled-manual-jobs

2 files changed, 4 insertions, 1 deletions

diff --git a/lib/api/commits.rb b/lib/api/commits.rb
index f0db1318146..ff927d1aa3c 100644
--- a/lib/api/commits.rb
+++ b/lib/api/commits.rb
@@ -110,6 +110,9 @@ module API
 
         if result[:status] == :success
           commit_detail = user_project.repository.commit(result[:result])
+
+          Gitlab::WebIdeCommitsCounter.increment if find_user_from_warden
+
           present commit_detail, with: Entities::CommitDetail
         else
           render_api_error!(result[:message], 400)
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 764905ca00f..440d94ae186 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -33,7 +33,6 @@ module API
       # rubocop: disable CodeReuse/ActiveRecord
       def find_merge_requests(args = {})
         args = declared_params.merge(args)
-
         args[:milestone_title] = args.delete(:milestone)
         args[:label_name] = args.delete(:labels)
         args[:scope] = args[:scope].underscore if args[:scope]
@@ -97,6 +96,7 @@ module API
         optional :source_branch, type: String, desc: 'Return merge requests with the given source branch'
         optional :target_branch, type: String, desc: 'Return merge requests with the given target branch'
         optional :search, type: String, desc: 'Search merge requests for text present in the title or description'
+        optional :wip, type: String, values: %w[yes no], desc: 'Search merge requests for WIP in the title'
         use :pagination
       end
     end