Add latest changes from gitlab-org/gitlab@master

7 files changed, 18 insertions, 34 deletions

diff --git a/lib/gitlab/auth/saml/config.rb b/lib/gitlab/auth/saml/config.rb
index 3f13a264b0a..815130aeee2 100644
--- a/lib/gitlab/auth/saml/config.rb
+++ b/lib/gitlab/auth/saml/config.rb
@@ -5,6 +5,10 @@ module Gitlab
     module Saml
       class Config
         class << self
+          def enabled?
+            ::AuthHelper.saml_providers.any?
+          end
+
           def options
             Gitlab::Auth::OAuth::Provider.config_for('saml')
           end
diff --git a/lib/gitlab/auth/saml/identity_linker.rb b/lib/gitlab/auth/saml/identity_linker.rb
index 93195c3189f..a44a9c2fca5 100644
--- a/lib/gitlab/auth/saml/identity_linker.rb
+++ b/lib/gitlab/auth/saml/identity_linker.rb
@@ -32,3 +32,5 @@ module Gitlab
     end
   end
 end
+
+Gitlab::Auth::Saml::IdentityLinker.prepend_mod
diff --git a/lib/gitlab/database/gitlab_schemas.yml b/lib/gitlab/database/gitlab_schemas.yml
index 900ba1e5b36..036ce7d7631 100644
--- a/lib/gitlab/database/gitlab_schemas.yml
+++ b/lib/gitlab/database/gitlab_schemas.yml
@@ -217,7 +217,6 @@ geo_event_log: :gitlab_main
 geo_events: :gitlab_main
 geo_hashed_storage_attachments_events: :gitlab_main
 geo_hashed_storage_migrated_events: :gitlab_main
-geo_job_artifact_deleted_events: :gitlab_main
 geo_lfs_object_deleted_events: :gitlab_main
 geo_node_namespace_links: :gitlab_main
 geo_nodes: :gitlab_main
diff --git a/lib/gitlab/database/migration_helpers.rb b/lib/gitlab/database/migration_helpers.rb
index f5e4aa1b19d..0453b81d67d 100644
--- a/lib/gitlab/database/migration_helpers.rb
+++ b/lib/gitlab/database/migration_helpers.rb
@@ -959,7 +959,7 @@ module Gitlab
 
         return if migration.finished?
 
-        Gitlab::Database::BackgroundMigration::BatchedMigrationRunner.finalize(job_class_name, table_name, column_name, job_arguments, connection: connection) if finalize
+        finalize_batched_background_migration(job_class_name: job_class_name, table_name: table_name, column_name: column_name, job_arguments: job_arguments) if finalize
 
         unless migration.reload.finished? # rubocop:disable Cop/ActiveRecordAssociationReload
           raise "Expected batched background migration for the given configuration to be marked as 'finished', " \
diff --git a/lib/gitlab/database/migrations/batched_background_migration_helpers.rb b/lib/gitlab/database/migrations/batched_background_migration_helpers.rb
index 75dc4da4bb9..7113c3686f1 100644
--- a/lib/gitlab/database/migrations/batched_background_migration_helpers.rb
+++ b/lib/gitlab/database/migrations/batched_background_migration_helpers.rb
@@ -124,6 +124,14 @@ module Gitlab
         end
 
         def finalize_batched_background_migration(job_class_name:, table_name:, column_name:, job_arguments:)
+          database_name = Gitlab::Database.db_config_name(connection)
+
+          unless ActiveRecord::Base.configurations.primary?(database_name)
+            raise 'The `#finalize_background_migration` is currently not supported when running in decomposed database, ' \
+              'and this database is not `main:`. For more information visit: ' \
+              'https://docs.gitlab.com/ee/development/database/migrations_for_multiple_databases.html'
+          end
+
           migration = Gitlab::Database::BackgroundMigration::BatchedMigration.find_for_configuration(job_class_name, table_name, column_name, job_arguments)
 
           raise 'Could not find batched background migration' if migration.nil?
diff --git a/lib/gitlab/diff/rendered/notebook/diff_file.rb b/lib/gitlab/diff/rendered/notebook/diff_file.rb
index e8b4523d40e..1f064d8af50 100644
--- a/lib/gitlab/diff/rendered/notebook/diff_file.rb
+++ b/lib/gitlab/diff/rendered/notebook/diff_file.rb
@@ -68,7 +68,9 @@ module Gitlab
 
               Timeout.timeout(timeout_time) do
                 IpynbDiff.diff(source_diff.old_blob&.data, source_diff.new_blob&.data,
-                               raise_if_invalid_nb: true, diffy_opts: { include_diff_info: true })&.tap do
+                               raise_if_invalid_nb: true,
+                               hide_images: true,
+                               diffy_opts: { include_diff_info: true })&.tap do
                   log_event(LOG_IPYNBDIFF_GENERATED)
                 end
               end
diff --git a/lib/gitlab/metrics/dashboard/importers/prometheus_metrics.rb b/lib/gitlab/metrics/dashboard/importers/prometheus_metrics.rb
index 8a176be30a2..e2b43798b22 100644
--- a/lib/gitlab/metrics/dashboard/importers/prometheus_metrics.rb
+++ b/lib/gitlab/metrics/dashboard/importers/prometheus_metrics.rb
@@ -33,7 +33,6 @@ module Gitlab
           def import
             delete_stale_metrics
             create_or_update_metrics
-            update_prometheus_environments
           end
 
           # rubocop: disable CodeReuse/ActiveRecord
@@ -47,8 +46,6 @@ module Gitlab
 
               affected_metric_ids << prometheus_metric.id
             end
-
-            @affected_environment_ids += find_alerts(affected_metric_ids).get_environment_id
           end
           # rubocop: enable CodeReuse/ActiveRecord
 
@@ -62,24 +59,9 @@ module Gitlab
 
             return unless stale_metrics.exists?
 
-            delete_stale_alerts(stale_metrics)
             stale_metrics.each_batch { |batch| batch.delete_all }
           end
 
-          def delete_stale_alerts(stale_metrics)
-            stale_alerts = find_alerts(stale_metrics)
-
-            affected_environment_ids = stale_alerts.get_environment_id
-            return unless affected_environment_ids.present?
-
-            @affected_environment_ids += affected_environment_ids
-            stale_alerts.each_batch { |batch| batch.delete_all }
-          end
-
-          def find_alerts(metrics)
-            Projects::Prometheus::AlertsFinder.new(project: project, metric: metrics).execute
-          end
-
           def prometheus_metrics_attributes
             @prometheus_metrics_attributes ||= begin
               Dashboard::Transformers::Yml::V1::PrometheusMetrics.new(
@@ -89,19 +71,6 @@ module Gitlab
               ).execute
             end
           end
-
-          def update_prometheus_environments
-            affected_environments = ::Environment.for_id(@affected_environment_ids.flatten.uniq).for_project(project)
-
-            return unless affected_environments.exists?
-
-            affected_environments.each do |affected_environment|
-              ::Clusters::Applications::ScheduleUpdateService.new(
-                affected_environment.cluster_prometheus_adapter,
-                project
-              ).execute
-            end
-          end
         end
       end
     end