summaryrefslogtreecommitdiff
path: root/config/initializers/active_record_transaction_observer.rb
diff options
context:
space:
mode:
Diffstat (limited to 'config/initializers/active_record_transaction_observer.rb')
-rw-r--r--config/initializers/active_record_transaction_observer.rb11
1 files changed, 1 insertions, 10 deletions
diff --git a/config/initializers/active_record_transaction_observer.rb b/config/initializers/active_record_transaction_observer.rb
index a1d4b13344e..b90b3a39ac1 100644
--- a/config/initializers/active_record_transaction_observer.rb
+++ b/config/initializers/active_record_transaction_observer.rb
@@ -1,18 +1,9 @@
# frozen_string_literal: true
-def feature_flags_available?
- # When the DBMS is not available, an exception (e.g. PG::ConnectionBad) is raised
- active_db_connection = ActiveRecord::Base.connection.active? rescue false
-
- active_db_connection && Feature::FlipperFeature.table_exists?
-rescue ActiveRecord::NoDatabaseError
- false
-end
-
return unless Gitlab.com? || Gitlab.dev_or_test_env?
Gitlab::Application.configure do
- if feature_flags_available? && ::Feature.enabled?(:active_record_transactions_tracking, type: :ops, default_enabled: :yaml)
+ if Feature.feature_flags_available? && ::Feature.enabled?(:active_record_transactions_tracking, type: :ops, default_enabled: :yaml)
Gitlab::Database::Transaction::Observer.register!
end
end