Add latest changes from gitlab-org/gitlab@master

.rubocop.yml

@@ -349,8 +349,8 @@ RSpec/HaveGitlabHttpStatus:
     - 'ee/spec/requests/{groups,projects,repositories}/**/*'
     - 'spec/requests/api/*/**/*.rb'
     - 'ee/spec/requests/api/*/**/*.rb'
-    - 'spec/requests/api/[a-o]*.rb'
-    - 'ee/spec/requests/api/[a-o]*.rb'
+    - 'spec/requests/api/[a-p]*.rb'
+    - 'ee/spec/requests/api/[a-p]*.rb'
 Style/MultilineWhenThen:
   Enabled: false

changelogs/unreleased/197918-add-package-type-to-project-packages-api.yml

+---
+title: Add package_type as a filter option to the packages list API endpoint
+merge_request: 25816
+author:
+type: added

changelogs/unreleased/199422-maximum-size-for-gitlab-pages-says-to-set-it-to-0-for-unlimited-bu.yml

+---
+title: Allow 0 to be set for pages maximum size per project/group to indicate unlimited
+  size
+merge_request: 25677
+author:
+type: fixed

config/initializers/lograge.rb

@@ -20,38 +20,6 @@ unless Gitlab::Runtime.sidekiq?
     config.lograge.ignore_actions = ['Gitlab::RequestForgeryProtection::Controller#index']
     # Add request parameters to log output
-    config.lograge.custom_options = lambda do |event|
-      params = event.payload[:params]
-        .except(*%w(controller action format))
-        .each_pair
-        .map { |k, v| { key: k, value: v } }
-
-      payload = {
-        time: Time.now.utc.iso8601(3),
-        params: Gitlab::Utils::LogLimitedArray.log_limited_array(params, sentinel: { key: 'truncated', value: '...' }),
-        remote_ip: event.payload[:remote_ip],
-        user_id: event.payload[:user_id],
-        username: event.payload[:username],
-        ua: event.payload[:ua],
-        queue_duration: event.payload[:queue_duration]
-      }
-
-      ::Gitlab::InstrumentationHelper.add_instrumentation_data(payload)
-
-      payload[:response] = event.payload[:response] if event.payload[:response]
-      payload[:etag_route] = event.payload[:etag_route] if event.payload[:etag_route]
-      payload[Labkit::Correlation::CorrelationId::LOG_KEY] = Labkit::Correlation::CorrelationId.current_id
-
-      if cpu_s = Gitlab::Metrics::System.thread_cpu_duration(::Gitlab::RequestContext.instance.start_thread_cpu_time)
-        payload[:cpu_s] = cpu_s
-      end
-
-      # https://github.com/roidrage/lograge#logging-errors--exceptions
-      exception = event.payload[:exception_object]
-
-      ::Gitlab::ExceptionLogFormatter.format!(exception, payload)
-
-      payload
-    end
+    config.lograge.custom_options = Gitlab::Lograge::CustomOptions
   end
 end

db/migrate/20180305144721_add_privileged_to_runner.rb

@@ -9,7 +9,7 @@ class AddPrivilegedToRunner < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
   def up
-    add_column_with_default :clusters_applications_runners, :privileged, :boolean, default: true, allow_null: false # rubocop:disable Migration/AddColumnWithDefault
+    add_column_with_default :clusters_applications_runners, :privileged, :boolean, default: true, allow_null: false
   end
   def down

db/migrate/20180423204600_add_pages_access_level_to_project_feature.rb

@@ -5,7 +5,7 @@ class AddPagesAccessLevelToProjectFeature < ActiveRecord::Migration[4.2]
   DOWNTIME = false
   def up
-    add_column_with_default(:project_features, :pages_access_level, :integer, default: ProjectFeature::PUBLIC, allow_null: false) # rubocop:disable Migration/AddColumnWithDefault
+    add_column_with_default(:project_features, :pages_access_level, :integer, default: ProjectFeature::PUBLIC, allow_null: false)
     change_column_default(:project_features, :pages_access_level, ProjectFeature::ENABLED)
   end

db/migrate/20180529093006_ensure_remote_mirror_columns.rb

@@ -11,7 +11,7 @@ class EnsureRemoteMirrorColumns < ActiveRecord::Migration[4.2]
     add_column :remote_mirrors, :remote_name, :string unless column_exists?(:remote_mirrors, :remote_name) # rubocop:disable Migration/AddLimitToStringColumns
     unless column_exists?(:remote_mirrors, :only_protected_branches)
-      add_column_with_default(:remote_mirrors, # rubocop:disable Migration/AddColumnWithDefault
+      add_column_with_default(:remote_mirrors,
                               :only_protected_branches,
                               :boolean,
                               default: false,

db/migrate/20180601213245_add_deploy_strategy_to_project_auto_devops.rb

@@ -10,7 +10,7 @@ class AddDeployStrategyToProjectAutoDevops < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
   def up
-    add_column_with_default :project_auto_devops, :deploy_strategy, :integer, default: 0, allow_null: false # rubocop:disable Migration/AddColumnWithDefault
+    add_column_with_default :project_auto_devops, :deploy_strategy, :integer, default: 0, allow_null: false
   end
   def down

db/migrate/20180831164905_add_common_to_prometheus_metrics.rb

@@ -8,7 +8,7 @@ class AddCommonToPrometheusMetrics < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
   def up
-    add_column_with_default(:prometheus_metrics, :common, :boolean, default: false) # rubocop:disable Migration/AddColumnWithDefault
+    add_column_with_default(:prometheus_metrics, :common, :boolean, default: false)
   end
   def down

db/migrate/20180907015926_add_legacy_abac_to_cluster_providers_gcp.rb

@@ -8,7 +8,7 @@ class AddLegacyAbacToClusterProvidersGcp < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
   def up
-    add_column_with_default(:cluster_providers_gcp, :legacy_abac, :boolean, default: true) # rubocop:disable Migration/AddColumnWithDefault
+    add_column_with_default(:cluster_providers_gcp, :legacy_abac, :boolean, default: true)
   end
   def down

db/migrate/20181017001059_add_cluster_type_to_clusters.rb

@@ -9,7 +9,7 @@ class AddClusterTypeToClusters < ActiveRecord::Migration[4.2]
   disable_ddl_transaction!
   def up
-    add_column_with_default(:clusters, :cluster_type, :smallint, default: PROJECT_CLUSTER_TYPE) # rubocop:disable Migration/AddColumnWithDefault
+    add_column_with_default(:clusters, :cluster_type, :smallint, default: PROJECT_CLUSTER_TYPE)
   end
   def down

db/migrate/20190218134158_add_masked_to_ci_variables.rb

@@ -12,7 +12,7 @@ class AddMaskedToCiVariables < ActiveRecord::Migration[5.0]
   disable_ddl_transaction!
   def up
-    add_column_with_default :ci_variables, :masked, :boolean, default: false, allow_null: false # rubocop:disable Migration/AddColumnWithDefault
+    add_column_with_default :ci_variables, :masked, :boolean, default: false, allow_null: false
   end
   def down

db/migrate/20190218134209_add_masked_to_ci_group_variables.rb

@@ -12,7 +12,7 @@ class AddMaskedToCiGroupVariables < ActiveRecord::Migration[5.0]
   disable_ddl_transaction!
   def up
-    add_column_with_default :ci_group_variables, :masked, :boolean, default: false, allow_null: false # rubocop:disable Migration/AddColumnWithDefault
+    add_column_with_default :ci_group_variables, :masked, :boolean, default: false, allow_null: false
   end
   def down

db/migrate/20190220142344_add_email_header_and_footer_enabled_flag_to_appearances_table.rb

@@ -8,7 +8,7 @@ class AddEmailHeaderAndFooterEnabledFlagToAppearancesTable < ActiveRecord::Migra
   DOWNTIME = false
   def up
-    add_column_with_default(:appearances, :email_header_and_footer_enabled, :boolean, default: false) # rubocop:disable Migration/AddColumnWithDefault
+    add_column_with_default(:appearances, :email_header_and_footer_enabled, :boolean, default: false)
   end
   def down

db/migrate/20190228192410_add_multi_line_attributes_to_suggestion.rb

@@ -8,11 +8,9 @@ class AddMultiLineAttributesToSuggestion < ActiveRecord::Migration[5.0]
   disable_ddl_transaction!
   def up
-    # rubocop:disable Migration/AddColumnWithDefault
     add_column_with_default :suggestions, :lines_above, :integer, default: 0, allow_null: false
     add_column_with_default :suggestions, :lines_below, :integer, default: 0, allow_null: false
     add_column_with_default :suggestions, :outdated, :boolean, default: false, allow_null: false
-    # rubocop:enable Migration/AddColumnWithDefault
   end
   def down

db/migrate/20190322164830_add_auto_ssl_enabled_to_pages_domain.rb

@@ -8,7 +8,7 @@ class AddAutoSslEnabledToPagesDomain < ActiveRecord::Migration[5.0]
   disable_ddl_transaction!
   def up
-    add_column_with_default :pages_domains, :auto_ssl_enabled, :boolean, default: false # rubocop:disable Migration/AddColumnWithDefault
+    add_column_with_default :pages_domains, :auto_ssl_enabled, :boolean, default: false
   end
   def down

db/migrate/20190325165127_add_managed_to_cluster.rb

@@ -8,7 +8,7 @@ class AddManagedToCluster < ActiveRecord::Migration[5.0]
   DOWNTIME = false
   def up
-    add_column_with_default(:clusters, :managed, :boolean, default: true) # rubocop:disable Migration/AddColumnWithDefault
+    add_column_with_default(:clusters, :managed, :boolean, default: true)
   end
   def down

db/migrate/20190415030217_add_variable_type_to_ci_variables.rb

@@ -8,7 +8,7 @@ class AddVariableTypeToCiVariables < ActiveRecord::Migration[5.0]
   ENV_VAR_VARIABLE_TYPE = 1
   def up
-    add_column_with_default(:ci_variables, :variable_type, :smallint, default: ENV_VAR_VARIABLE_TYPE) # rubocop:disable Migration/AddColumnWithDefault
+    add_column_with_default(:ci_variables, :variable_type, :smallint, default: ENV_VAR_VARIABLE_TYPE)
   end
   def down

db/migrate/20190416185130_add_merge_train_enabled_to_ci_cd_settings.rb

@@ -8,12 +8,10 @@ class AddMergeTrainEnabledToCiCdSettings < ActiveRecord::Migration[5.1]
   disable_ddl_transaction!
   # rubocop:disable Migration/UpdateLargeTable
-  # rubocop:disable Migration/AddColumnWithDefault
   def up
     add_column_with_default :project_ci_cd_settings, :merge_trains_enabled, :boolean, default: false, allow_null: false
   end
   # rubocop:enable Migration/UpdateLargeTable
-  # rubocop:enable Migration/AddColumnWithDefault
   def down
     remove_column :project_ci_cd_settings, :merge_trains_enabled

db/migrate/20190416213556_add_variable_type_to_ci_group_variables.rb

@@ -8,7 +8,7 @@ class AddVariableTypeToCiGroupVariables < ActiveRecord::Migration[5.0]
   ENV_VAR_VARIABLE_TYPE = 1
   def up
-    add_column_with_default(:ci_group_variables, :variable_type, :smallint, default: ENV_VAR_VARIABLE_TYPE) # rubocop:disable Migration/AddColumnWithDefault
+    add_column_with_default(:ci_group_variables, :variable_type, :smallint, default: ENV_VAR_VARIABLE_TYPE)
   end
   def down