Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 28 deletions

diff --git a/lib/api/helpers/integrations_helpers.rb b/lib/api/helpers/integrations_helpers.rb
index c334f618847..dd3009ff1d7 100644
--- a/lib/api/helpers/integrations_helpers.rb
+++ b/lib/api/helpers/integrations_helpers.rb
@@ -127,34 +127,8 @@ module API
       def self.integrations
         {
           'apple-app-store' => ::Integrations::AppleAppStore.api_fields,
-          'asana' => [
-            {
-              required: true,
-              name: :api_key,
-              type: String,
-              desc: 'User API token'
-            },
-            {
-              required: false,
-              name: :restrict_to_branch,
-              type: String,
-              desc: 'Comma-separated list of branches which will be automatically inspected. Leave blank to include all branches'
-            }
-          ],
-          'assembla' => [
-            {
-              required: true,
-              name: :token,
-              type: String,
-              desc: 'The authentication token'
-            },
-            {
-              required: false,
-              name: :subdomain,
-              type: String,
-              desc: 'Subdomain setting'
-            }
-          ],
+          'asana' => ::Integrations::Asana.api_fields,
+          'assembla' => ::Integrations::Assembla.api_fields,
           'bamboo' => [
             {
               required: true,
diff --git a/lib/gitlab/database/health_status/indicators/autovacuum_active_on_table.rb b/lib/gitlab/database/health_status/indicators/autovacuum_active_on_table.rb
index 6bf2bbf0c70..f3aa03657c7 100644
--- a/lib/gitlab/database/health_status/indicators/autovacuum_active_on_table.rb
+++ b/lib/gitlab/database/health_status/indicators/autovacuum_active_on_table.rb
@@ -26,6 +26,10 @@ module Gitlab
           attr_reader :tables
 
           def enabled?
+            if tables.include?('ci_builds') && Feature.enabled?(:skip_autovacuum_health_check_for_ci_builds, type: :ops)
+              return false
+            end
+
             Feature.enabled?(:batched_migrations_health_status_autovacuum, type: :ops)
           end