Add latest changes from gitlab-org/gitlab@master

5 files changed, 5 insertions, 7 deletions

diff --git a/lib/api/deploy_keys.rb b/lib/api/deploy_keys.rb
index ca13db8701e..c53f4bca5a7 100644
--- a/lib/api/deploy_keys.rb
+++ b/lib/api/deploy_keys.rb
@@ -161,9 +161,7 @@ module API
         end
       end
 
-      desc 'Delete deploy key for a project' do
-        success Key
-      end
+      desc 'Delete deploy key for a project'
       params do
         requires :key_id, type: Integer, desc: 'The ID of the deploy key'
       end
diff --git a/lib/api/group_import.rb b/lib/api/group_import.rb
index abb8c10efc6..cef9b542c9e 100644
--- a/lib/api/group_import.rb
+++ b/lib/api/group_import.rb
@@ -54,7 +54,7 @@ module API
       params do
         requires :path, type: String, desc: 'Group path'
         requires :name, type: String, desc: 'Group name'
-        requires :file, type: ::API::Validations::Types::WorkhorseFile, desc: 'The group export file to be imported'
+        requires :file, type: ::API::Validations::Types::WorkhorseFile, desc: 'The group export file to be imported', documentation: { type: 'file' }
         optional :parent_id, type: Integer, desc: "The ID of the parent group that the group will be imported into. Defaults to the current user's namespace."
       end
       post 'import' do
diff --git a/lib/api/helm_packages.rb b/lib/api/helm_packages.rb
index fefb2a73b6e..fa2537bcfc4 100644
--- a/lib/api/helm_packages.rb
+++ b/lib/api/helm_packages.rb
@@ -91,7 +91,7 @@ module API
         end
         params do
           requires :channel, type: String, desc: 'Helm channel', regexp: Gitlab::Regex.helm_channel_regex
-          requires :chart, type: ::API::Validations::Types::WorkhorseFile, desc: 'The chart file to be published (generated by Multipart middleware)'
+          requires :chart, type: ::API::Validations::Types::WorkhorseFile, desc: 'The chart file to be published (generated by Multipart middleware)', documentation: { type: 'file' }
         end
         post "api/:channel/charts" do
           authorize_upload!(authorized_user_project)
diff --git a/lib/api/helpers/groups_helpers.rb b/lib/api/helpers/groups_helpers.rb
index e9af50b80be..74c8b582fde 100644
--- a/lib/api/helpers/groups_helpers.rb
+++ b/lib/api/helpers/groups_helpers.rb
@@ -11,7 +11,7 @@ module API
         optional :visibility, type: String,
                               values: Gitlab::VisibilityLevel.string_values,
                               desc: 'The visibility of the group'
-        optional :avatar, type: ::API::Validations::Types::WorkhorseFile, desc: 'Avatar image for the group'
+        optional :avatar, type: ::API::Validations::Types::WorkhorseFile, desc: 'Avatar image for the group', documentation: { type: 'file' }
         optional :share_with_group_lock, type: Boolean, desc: 'Prevent sharing a project with another group within this group'
         optional :require_two_factor_authentication, type: Boolean, desc: 'Require all users in this group to setup Two-factor authentication'
         optional :two_factor_grace_period, type: Integer, desc: 'Time before Two-factor authentication is enforced'
diff --git a/lib/gitlab/utils/execution_tracker.rb b/lib/gitlab/utils/execution_tracker.rb
index 6d48658853c..92398926e1b 100644
--- a/lib/gitlab/utils/execution_tracker.rb
+++ b/lib/gitlab/utils/execution_tracker.rb
@@ -3,7 +3,7 @@
 module Gitlab
   module Utils
     class ExecutionTracker
-      MAX_RUNTIME = 30.seconds
+      MAX_RUNTIME = 60.seconds
 
       ExecutionTimeOutError = Class.new(StandardError)