Add latest changes from gitlab-org/gitlab@12-3-auto-deploy-20190916stable-branch-foss-test

3 files changed, 1 insertions, 14 deletions

diff --git a/lib/api/helpers/issues_helpers.rb b/lib/api/helpers/issues_helpers.rb
index e272b13f3ae..8addcd18fe3 100644
--- a/lib/api/helpers/issues_helpers.rb
+++ b/lib/api/helpers/issues_helpers.rb
@@ -11,9 +11,6 @@ module API
       params :optional_issues_params_ee do
       end
 
-      params :optional_issue_not_params_ee do
-      end
-
       def self.update_params_at_least_one_of
         [
           :assignee_id,
@@ -38,11 +35,8 @@ module API
         args = declared_params.merge(args)
 
         args.delete(:id)
-        args[:not] ||= {}
         args[:milestone_title] ||= args.delete(:milestone)
-        args[:not][:milestone_title] ||= args[:not]&.delete(:milestone)
         args[:label_name] ||= args.delete(:labels)
-        args[:not][:label_name] ||= args[:not]&.delete(:labels)
         args[:scope] = args[:scope].underscore if args[:scope]
         args[:sort] = "#{args[:order_by]}_#{args[:sort]}"
 
diff --git a/lib/api/helpers/projects_helpers.rb b/lib/api/helpers/projects_helpers.rb
index 07f0386d14d..f247c722c44 100644
--- a/lib/api/helpers/projects_helpers.rb
+++ b/lib/api/helpers/projects_helpers.rb
@@ -56,14 +56,6 @@ module API
         use :optional_project_params_ee
       end
 
-      params :optional_create_project_params_ee do
-      end
-
-      params :optional_create_project_params do
-        use :optional_project_params
-        use :optional_create_project_params_ee
-      end
-
       params :optional_filter_params_ee do
       end
 
diff --git a/lib/api/helpers/services_helpers.rb b/lib/api/helpers/services_helpers.rb
index eba4ebb4b6e..5331de3c035 100644
--- a/lib/api/helpers/services_helpers.rb
+++ b/lib/api/helpers/services_helpers.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 # frozen_string_literal: true
 
 module API