Add latest changes from gitlab-org/gitlab@master

7 files changed, 111 insertions, 58 deletions

diff --git a/lib/api/access_requests.rb b/lib/api/access_requests.rb
index 74f6515f07f..38a9856ca58 100644
--- a/lib/api/access_requests.rb
+++ b/lib/api/access_requests.rb
@@ -19,6 +19,7 @@ module API
         desc "Gets a list of access requests for a #{source_type}." do
           detail 'This feature was introduced in GitLab 8.11.'
           success Entities::AccessRequester
+          tags %w[access_requests]
         end
         params do
           use :pagination
@@ -37,6 +38,24 @@ module API
         desc "Requests access for the authenticated user to a #{source_type}." do
           detail 'This feature was introduced in GitLab 8.11.'
           success Entities::AccessRequester
+          success [
+            {
+              code: 200,
+              model: Entities::AccessRequester,
+              message: 'successful operation',
+              examples: {
+                successfull_response: {
+                  "id" => 1,
+                  "username" => "raymond_smith",
+                  "name" => "Raymond Smith",
+                  "state" => "active",
+                  "created_at" => "2012-10-22T14:13:35Z",
+                  "access_level" => 20
+                }
+              }
+            }
+          ]
+          tags %w[access_requests]
         end
         post ":id/access_requests" do
           source = find_source(source_type, params[:id])
@@ -51,7 +70,24 @@ module API
 
         desc 'Approves an access request for the given user.' do
           detail 'This feature was introduced in GitLab 8.11.'
-          success Entities::Member
+          success [
+            {
+              code: 200,
+              model: Entities::AccessRequester,
+              message: 'successful operation',
+              examples: {
+                successfull_response: {
+                  "id" => 1,
+                  "username" => "raymond_smith",
+                  "name" => "Raymond Smith",
+                  "state" => "active",
+                  "created_at" => "2012-10-22T14:13:35Z",
+                  "access_level" => 20
+                }
+              }
+            }
+          ]
+          tags %w[access_requests]
         end
         params do
           requires :user_id, type: Integer, desc: 'The user ID of the access requester'
@@ -74,6 +110,7 @@ module API
 
         desc 'Denies an access request for the given user.' do
           detail 'This feature was introduced in GitLab 8.11.'
+          tags %w[access_requests]
         end
         params do
           requires :user_id, type: Integer, desc: 'The user ID of the access requester'
diff --git a/lib/api/api.rb b/lib/api/api.rb
index 981260b9429..089278ab383 100644
--- a/lib/api/api.rb
+++ b/lib/api/api.rb
@@ -169,13 +169,13 @@ module API
 
       # Mount endpoints to include in the OpenAPI V2 documentation here
       namespace do
+        mount ::API::AccessRequests
         mount ::API::Metadata
 
         add_open_api_documentation!
       end
 
       # Keep in alphabetical order
-      mount ::API::AccessRequests
       mount ::API::Admin::BatchedBackgroundMigrations
       mount ::API::Admin::Ci::Variables
       mount ::API::Admin::InstanceClusters
diff --git a/lib/api/ci/jobs.rb b/lib/api/ci/jobs.rb
index 6049993bf6f..0de915c22e0 100644
--- a/lib/api/ci/jobs.rb
+++ b/lib/api/ci/jobs.rb
@@ -16,7 +16,7 @@ module API
 
         helpers do
           params :optional_scope do
-            optional :scope, types: [String, Array[String]], desc: 'The scope of builds to show',
+            optional :scope, type: Array[String], desc: 'The scope of builds to show',
                              values: ::CommitStatus::AVAILABLE_STATUSES,
                              coerce_with: ->(scope) {
                                case scope
diff --git a/lib/api/ci/runner.rb b/lib/api/ci/runner.rb
index 2d2dcc544f9..52646c80d4b 100644
--- a/lib/api/ci/runner.rb
+++ b/lib/api/ci/runner.rb
@@ -17,7 +17,13 @@ module API
           optional :description, type: String, desc: %q(Runner's description)
           optional :maintainer_note, type: String, desc: %q(Deprecated: Use :maintenance_note instead. Runner's maintenance notes)
           optional :maintenance_note, type: String, desc: %q(Runner's maintenance notes)
-          optional :info, type: Hash, desc: %q(Runner's metadata)
+          optional :info, type: Hash, desc: %q(Runner's metadata) do
+            optional :name, type: String, desc: %q(Runner's name)
+            optional :version, type: String, desc: %q(Runner's version)
+            optional :revision, type: String, desc: %q(Runner's revision)
+            optional :platform, type: String, desc: %q(Runner's platform)
+            optional :architecture, type: String, desc: %q(Runner's architecture)
+          end
           optional :active, type: Boolean, desc: 'Deprecated: Use `:paused` instead. Should runner be active'
           optional :paused, type: Boolean, desc: 'Whether the runner should ignore new jobs'
           optional :locked, type: Boolean, desc: 'Whether the runner should be locked for current project'
@@ -285,14 +291,14 @@ module API
         end
         params do
           requires :id, type: Integer, desc: %q(Job's ID)
-          requires :file, type: ::API::Validations::Types::WorkhorseFile, desc: %(The artifact file to store (generated by Multipart middleware))
+          requires :file, type: ::API::Validations::Types::WorkhorseFile, desc: %(The artifact file to store (generated by Multipart middleware)), documentation: { type: 'file' }
           optional :token, type: String, desc: %q(Job's authentication token)
           optional :expire_in, type: String, desc: %q(Specify when artifacts should expire)
           optional :artifact_type, type: String, desc: %q(The type of artifact),
                                    default: 'archive', values: ::Ci::JobArtifact.file_types.keys
           optional :artifact_format, type: String, desc: %q(The format of artifact),
                                      default: 'zip', values: ::Ci::JobArtifact.file_formats.keys
-          optional :metadata, type: ::API::Validations::Types::WorkhorseFile, desc: %(The artifact metadata to store (generated by Multipart middleware))
+          optional :metadata, type: ::API::Validations::Types::WorkhorseFile, desc: %(The artifact metadata to store (generated by Multipart middleware)), documentation: { type: 'file' }
         end
         post '/:id/artifacts', feature_category: :build_artifacts, urgency: :low do
           not_allowed! unless Gitlab.config.artifacts.enabled
diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index 72b56f34ea6..e692b5d53ac 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -7,6 +7,7 @@ module Gitlab
       include Migrations::BackgroundMigrationHelpers
       include Migrations::BatchedBackgroundMigrationHelpers
       include Migrations::LockRetriesHelpers
+      include Migrations::TimeoutHelpers
       include DynamicModelHelpers
       include RenameTableHelpers
       include AsyncIndexes::MigrationHelpers
@@ -361,51 +362,6 @@ module Gitlab
         "#{prefix}#{hashed_identifier}"
       end
 
-      # Long-running migrations may take more than the timeout allowed by
-      # the database. Disable the session's statement timeout to ensure
-      # migrations don't get killed prematurely.
-      #
-      # There are two possible ways to disable the statement timeout:
-      #
-      # - Per transaction (this is the preferred and default mode)
-      # - Per connection (requires a cleanup after the execution)
-      #
-      # When using a per connection disable statement, code must be inside
-      # a block so we can automatically execute `RESET statement_timeout` after block finishes
-      # otherwise the statement will still be disabled until connection is dropped
-      # or `RESET statement_timeout` is executed
-      def disable_statement_timeout
-        if block_given?
-          if statement_timeout_disabled?
-            # Don't do anything if the statement_timeout is already disabled
-            # Allows for nested calls of disable_statement_timeout without
-            # resetting the timeout too early (before the outer call ends)
-            yield
-          else
-            begin
-              execute('SET statement_timeout TO 0')
-
-              yield
-            ensure
-              execute('RESET statement_timeout')
-            end
-          end
-        else
-          unless transaction_open?
-            raise <<~ERROR
-              Cannot call disable_statement_timeout() without a transaction open or outside of a transaction block.
-              If you don't want to use a transaction wrap your code in a block call:
-
-              disable_statement_timeout { # code that requires disabled statement here }
-
-              This will make sure statement_timeout is disabled before and reset after the block execution is finished.
-            ERROR
-          end
-
-          execute('SET LOCAL statement_timeout TO 0')
-        end
-      end
-
       def true_value
         Database.true_value
       end
@@ -1540,11 +1496,6 @@ into similar problems in the future (e.g. when new tables are created).
         connection.exec_query(check_sql)
       end
 
-      def statement_timeout_disabled?
-        # This is a string of the form "100ms" or "0" when disabled
-        connection.select_value('SHOW statement_timeout') == "0"
-      end
-
       def column_is_nullable?(table, column)
         # Check if table.column has not been defined with NOT NULL
         check_sql = <<~SQL
diff --git a/lib/gitlab/database/migrations/timeout_helpers.rb b/lib/gitlab/database/migrations/timeout_helpers.rb
new file mode 100644
index 00000000000..423c77452b1
--- /dev/null
+++ b/lib/gitlab/database/migrations/timeout_helpers.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Database
+    module Migrations
+      module TimeoutHelpers
+        # Long-running migrations may take more than the timeout allowed by
+        # the database. Disable the session's statement timeout to ensure
+        # migrations don't get killed prematurely.
+        #
+        # There are two possible ways to disable the statement timeout:
+        #
+        # - Per transaction (this is the preferred and default mode)
+        # - Per connection (requires a cleanup after the execution)
+        #
+        # When using a per connection disable statement, code must be inside
+        # a block so we can automatically execute `RESET statement_timeout` after block finishes
+        # otherwise the statement will still be disabled until connection is dropped
+        # or `RESET statement_timeout` is executed
+        def disable_statement_timeout
+          if block_given?
+            if statement_timeout_disabled?
+              # Don't do anything if the statement_timeout is already disabled
+              # Allows for nested calls of disable_statement_timeout without
+              # resetting the timeout too early (before the outer call ends)
+              yield
+            else
+              begin
+                execute('SET statement_timeout TO 0')
+
+                yield
+              ensure
+                execute('RESET statement_timeout')
+              end
+            end
+          else
+            unless transaction_open?
+              raise <<~ERROR
+                Cannot call disable_statement_timeout() without a transaction open or outside of a transaction block.
+                If you don't want to use a transaction wrap your code in a block call:
+
+                disable_statement_timeout { # code that requires disabled statement here }
+
+                This will make sure statement_timeout is disabled before and reset after the block execution is finished.
+              ERROR
+            end
+
+            execute('SET LOCAL statement_timeout TO 0')
+          end
+        end
+
+        private
+
+        def statement_timeout_disabled?
+          # This is a string of the form "100ms" or "0" when disabled
+          connection.select_value('SHOW statement_timeout') == "0"
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/doorkeeper_secret_storing/token/pbkdf2_sha512.rb b/lib/gitlab/doorkeeper_secret_storing/token/pbkdf2_sha512.rb
index f9e6d4076f3..7bb9ac2ffdb 100644
--- a/lib/gitlab/doorkeeper_secret_storing/token/pbkdf2_sha512.rb
+++ b/lib/gitlab/doorkeeper_secret_storing/token/pbkdf2_sha512.rb
@@ -12,8 +12,6 @@ module Gitlab
         SALT = ''
 
         def self.transform_secret(plain_secret)
-          return plain_secret unless Feature.enabled?(:hash_oauth_tokens)
-
           Devise::Pbkdf2Encryptable::Encryptors::Pbkdf2Sha512.digest(plain_secret, STRETCHES, SALT)
         end