Skip to content

Commit

Permalink
Rails 3.2 compatibility
Browse files Browse the repository at this point in the history
ActiveSupport concerns deprecation warning fix.
  • Loading branch information
cjbottaro committed Jan 28, 2012
1 parent 4738919 commit f8b273a
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 44 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG
@@ -1,3 +1,7 @@
4.0.0
* Rails 3.2 compatibility.
* Fix ActiveSupport concerns deprecation warning

3.0.0 3.0.0
----- -----
* Rails 3.1 compatibility. * Rails 3.1 compatibility.
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -6,5 +6,5 @@ group :development do
end end


group :test do group :test do
gem "rails", "~> 3.1.0" gem "rails", "~> 3.2.0"
end end
82 changes: 40 additions & 42 deletions Gemfile.lock
@@ -1,35 +1,34 @@
GEM GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
actionmailer (3.1.1) actionmailer (3.2.1)
actionpack (= 3.1.1) actionpack (= 3.2.1)
mail (~> 2.3.0) mail (~> 2.4.0)
actionpack (3.1.1) actionpack (3.2.1)
activemodel (= 3.1.1) activemodel (= 3.2.1)
activesupport (= 3.1.1) activesupport (= 3.2.1)
builder (~> 3.0.0) builder (~> 3.0.0)
erubis (~> 2.7.0) erubis (~> 2.7.0)
i18n (~> 0.6) journey (~> 1.0.1)
rack (~> 1.3.2) rack (~> 1.4.0)
rack-cache (~> 1.1) rack-cache (~> 1.1)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1) rack-test (~> 0.6.1)
sprockets (~> 2.0.2) sprockets (~> 2.1.2)
activemodel (3.1.1) activemodel (3.2.1)
activesupport (= 3.1.1) activesupport (= 3.2.1)
builder (~> 3.0.0) builder (~> 3.0.0)
i18n (~> 0.6) activerecord (3.2.1)
activerecord (3.1.1) activemodel (= 3.2.1)
activemodel (= 3.1.1) activesupport (= 3.2.1)
activesupport (= 3.1.1) arel (~> 3.0.0)
arel (~> 2.2.1)
tzinfo (~> 0.3.29) tzinfo (~> 0.3.29)
activeresource (3.1.1) activeresource (3.2.1)
activemodel (= 3.1.1) activemodel (= 3.2.1)
activesupport (= 3.1.1) activesupport (= 3.2.1)
activesupport (3.1.1) activesupport (3.2.1)
i18n (~> 0.6)
multi_json (~> 1.0) multi_json (~> 1.0)
arel (2.2.1) arel (3.0.0)
builder (3.0.0) builder (3.0.0)
erubis (2.7.0) erubis (2.7.0)
git (1.2.5) git (1.2.5)
Expand All @@ -39,42 +38,41 @@ GEM
bundler (~> 1.0) bundler (~> 1.0)
git (>= 1.2.5) git (>= 1.2.5)
rake rake
json (1.6.1) journey (1.0.1)
mail (2.3.0) json (1.6.5)
mail (2.4.1)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
mime-types (1.17.2) mime-types (1.17.2)
multi_json (1.0.3) multi_json (1.0.4)
polyglot (0.3.3) polyglot (0.3.3)
rack (1.3.5) rack (1.4.1)
rack-cache (1.1) rack-cache (1.1)
rack (>= 0.4) rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
rack-ssl (1.3.2) rack-ssl (1.3.2)
rack rack
rack-test (0.6.1) rack-test (0.6.1)
rack (>= 1.0) rack (>= 1.0)
rails (3.1.1) rails (3.2.1)
actionmailer (= 3.1.1) actionmailer (= 3.2.1)
actionpack (= 3.1.1) actionpack (= 3.2.1)
activerecord (= 3.1.1) activerecord (= 3.2.1)
activeresource (= 3.1.1) activeresource (= 3.2.1)
activesupport (= 3.1.1) activesupport (= 3.2.1)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.1.1) railties (= 3.2.1)
railties (3.1.1) railties (3.2.1)
actionpack (= 3.1.1) actionpack (= 3.2.1)
activesupport (= 3.1.1) activesupport (= 3.2.1)
rack-ssl (~> 1.3.2) rack-ssl (~> 1.3.2)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
thor (~> 0.14.6) thor (~> 0.14.6)
rake (0.9.2.2) rake (0.9.2.2)
rdoc (3.11) rdoc (3.12)
json (~> 1.4) json (~> 1.4)
sprockets (2.0.3) sprockets (2.1.2)
hike (~> 1.2) hike (~> 1.2)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
Expand All @@ -83,11 +81,11 @@ GEM
treetop (1.4.10) treetop (1.4.10)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.30) tzinfo (0.3.31)


PLATFORMS PLATFORMS
ruby ruby


DEPENDENCIES DEPENDENCIES
jeweler jeweler
rails (~> 3.1.0) rails (~> 3.2.0)
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
3.0.0 4.0.0

0 comments on commit f8b273a

Please sign in to comment.