Rails 5.1 compatibility

Applying from upstream carrierwaveuploader#2130 carrierwaveuploader#2133
skroutz · Dec 10, 2018 · 932d6d2 · 932d6d2
1 parent 568d87b
commit 932d6d2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/carrierwave/mount.rb b/lib/carrierwave/mount.rb
@@ -182,7 +182,8 @@ def #{column}_identifier
         end
 
         def store_previous_changes_for_#{column}
-          ch = changes.symbolize_keys
+          ch = ::ActiveRecord.version.to_s.to_f >= 5.1 ? saved_changes : changes
+          ch = ch.symbolize_keys
           @_previous_changes_for_#{column} = ch[_mounter(:#{column}).serialization_column]
         end
 
@@ -333,7 +334,8 @@ def #{column}_identifiers
         end
 
         def store_previous_changes_for_#{column}
-          ch = changes.symbolize_keys
+          ch = ::ActiveRecord.version.to_s.to_f >= 5.1 ? saved_changes : changes
+          ch = ch.symbolize_keys
           @_previous_changes_for_#{column} = ch[_mounter(:#{column}).serialization_column]
         end
 

diff --git a/lib/carrierwave/mounter.rb b/lib/carrierwave/mounter.rb
@@ -122,6 +122,7 @@ def serialization_column
     end
 
     def remove_previous(before=nil, after=nil)
+      after ||= []
       return unless before
 
       # both 'before' and 'after' can be string when 'mount_on' option is set