Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

3 files changed, 3 insertions, 3 deletions

diff --git a/app/services/feature_flags/create_service.rb b/app/services/feature_flags/create_service.rb
index 5c87af561d5..5111f914447 100644
--- a/app/services/feature_flags/create_service.rb
+++ b/app/services/feature_flags/create_service.rb
@@ -6,7 +6,7 @@ module FeatureFlags
       return error('Access Denied', 403) unless can_create?
       return error('Version is invalid', :bad_request) unless valid_version?
 
-      ActiveRecord::Base.transaction do
+      ApplicationRecord.transaction do
         feature_flag = project.operations_feature_flags.new(params)
 
         if feature_flag.save
diff --git a/app/services/feature_flags/destroy_service.rb b/app/services/feature_flags/destroy_service.rb
index b131a349fc7..986fe004db6 100644
--- a/app/services/feature_flags/destroy_service.rb
+++ b/app/services/feature_flags/destroy_service.rb
@@ -11,7 +11,7 @@ module FeatureFlags
     def destroy_feature_flag(feature_flag)
       return error('Access Denied', 403) unless can_destroy?(feature_flag)
 
-      ActiveRecord::Base.transaction do
+      ApplicationRecord.transaction do
         if feature_flag.destroy
           save_audit_event(audit_event(feature_flag))
 
diff --git a/app/services/feature_flags/update_service.rb b/app/services/feature_flags/update_service.rb
index f5ab6f4005b..01e4f661d75 100644
--- a/app/services/feature_flags/update_service.rb
+++ b/app/services/feature_flags/update_service.rb
@@ -12,7 +12,7 @@ module FeatureFlags
       return error('Access Denied', 403) unless can_update?(feature_flag)
       return error('Not Found', 404) unless valid_user_list_ids?(feature_flag, user_list_ids(params))
 
-      ActiveRecord::Base.transaction do
+      ApplicationRecord.transaction do
         feature_flag.assign_attributes(params)
 
         feature_flag.strategies.each do |strategy|