Permalink
Browse files

Update dependencies for Rails 4 edge.

Reflects changes made to ActiveSupport and the
recently extracted rails-observers gem.
  • Loading branch information...
1 parent 7b6bf03 commit 577202c69678555a336daf9087172d4650707aaf @caike caike committed Dec 7, 2012
Showing with 5 additions and 1 deletion.
  1. +2 −0 Gemfile
  2. +2 −0 lib/active_resource/observing.rb
  3. +1 −1 test/setter_trap.rb
View
@@ -11,6 +11,8 @@ end
gem 'activesupport', rails_gem_source.dup
gem 'activemodel', rails_gem_source.dup
+gem 'rails-observers', github: 'rails/rails-observers'
+gem 'journey', github: 'rails/journey'
gem 'rake'
# Add your own local bundler stuff
@@ -1,3 +1,5 @@
+require 'rails/observers/active_model/observing'
+
module ActiveResource
module Observing
extend ActiveSupport::Concern
View
@@ -1,4 +1,4 @@
-class SetterTrap < ActiveSupport::BasicObject
+class SetterTrap < ActiveSupport::ProxyObject
class << self
def rollback_sets(obj)
trapped = new(obj)

0 comments on commit 577202c

Please sign in to comment.