Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #44 from caike/master

Update dependencies to fix test suite.
  • Loading branch information...
commit df43ecd4e5bd9c0b89dc1f1b3575a98ad5230595 2 parents 7b6bf03 + bf9a93f
@guilleiguaran guilleiguaran authored
View
1  Gemfile
@@ -11,6 +11,7 @@ end
gem 'activesupport', rails_gem_source.dup
gem 'activemodel', rails_gem_source.dup
+gem 'rails-observers', github: 'rails/rails-observers'
gem 'rake'
# Add your own local bundler stuff
View
2  lib/active_resource/observing.rb
@@ -1,3 +1,5 @@
+require 'rails/observers/active_model/observing'
+
module ActiveResource
module Observing
extend ActiveSupport::Concern
View
2  test/setter_trap.rb
@@ -1,4 +1,4 @@
-class SetterTrap < ActiveSupport::BasicObject
+class SetterTrap < ActiveSupport::ProxyObject
class << self
def rollback_sets(obj)
trapped = new(obj)
Please sign in to comment.
Something went wrong with that request. Please try again.