Merge pull request #4080 from zendesk/zendesk-mattlefevre/upgrade-aud…

…ited-gem Bump audited gem to latest
zendesk · Nov 17, 2023 · d4e1c6d · d4e1c6d
2 parents 88a7a43 + 7c04166
commit d4e1c6d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -278,8 +278,9 @@ GEM
     ast (2.4.1)
     attr_encrypted (3.1.0)
       encryptor (~> 3.0.0)
-    audited (4.10.0)
-      activerecord (>= 4.2, < 6.2)
+    audited (5.4.2)
+      activerecord (>= 5.0, < 7.2)
+      request_store (~> 1.2)
     autoprefixer-rails (9.4.8)
       execjs
     awesome_print (1.6.1)

diff --git a/app/models/stage.rb b/app/models/stage.rb
@@ -220,8 +220,8 @@ def locked_by?(lock)
 
   private
 
-  def audited_changes
-    super.merge(script_changes)
+  def audited_changes(...)
+    super.merge(**script_changes)
   end
 
   def script_changes

diff --git a/plugins/env/decorators/project_decorator.rb b/plugins/env/decorators/project_decorator.rb
@@ -18,7 +18,7 @@ def environment_variable_group_ids=(*)
     super
   end
 
-  def audited_changes
+  def audited_changes(...)
     super.merge(environment_variables_changes)
   end
 

diff --git a/test/integration/cleanliness_test.rb b/test/integration/cleanliness_test.rb
@@ -247,7 +247,7 @@ def assert_content(files)
         next if association.name == :audits # should never be destroyed
         next if association.options.key?(:through) # already cleaned up via through relation
         next if association.options.key?(:dependent) # already defined
-        next if association.is_a?(Doorkeeper::Application) && association.name == :authorized_tokens
+        next if association.name == :authorized_tokens # removed only when user is deleted; otherwise soft deleted
         "#{model.name} #{association.name}"
       end
     end.compact