upgraded to rails 3.2.1
This commit is contained in:
2
Gemfile
2
Gemfile
@@ -14,7 +14,7 @@ group :assets do
|
|||||||
gem "therubyracer"
|
gem "therubyracer"
|
||||||
end
|
end
|
||||||
|
|
||||||
gem "rails", "3.2.0"
|
gem "rails", "3.2.1"
|
||||||
gem "pg"
|
gem "pg"
|
||||||
gem "memcache-client", :require => "memcache"
|
gem "memcache-client", :require => "memcache"
|
||||||
gem "delayed_job"
|
gem "delayed_job"
|
||||||
|
|||||||
52
Gemfile.lock
52
Gemfile.lock
@@ -36,31 +36,31 @@ GIT
|
|||||||
GEM
|
GEM
|
||||||
remote: http://gemcutter.org/
|
remote: http://gemcutter.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (3.2.0)
|
actionmailer (3.2.1)
|
||||||
actionpack (= 3.2.0)
|
actionpack (= 3.2.1)
|
||||||
mail (~> 2.4.0)
|
mail (~> 2.4.0)
|
||||||
actionpack (3.2.0)
|
actionpack (3.2.1)
|
||||||
activemodel (= 3.2.0)
|
activemodel (= 3.2.1)
|
||||||
activesupport (= 3.2.0)
|
activesupport (= 3.2.1)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
journey (~> 1.0.0)
|
journey (~> 1.0.1)
|
||||||
rack (~> 1.4.0)
|
rack (~> 1.4.0)
|
||||||
rack-cache (~> 1.1)
|
rack-cache (~> 1.1)
|
||||||
rack-test (~> 0.6.1)
|
rack-test (~> 0.6.1)
|
||||||
sprockets (~> 2.1.2)
|
sprockets (~> 2.1.2)
|
||||||
activemodel (3.2.0)
|
activemodel (3.2.1)
|
||||||
activesupport (= 3.2.0)
|
activesupport (= 3.2.1)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
activerecord (3.2.0)
|
activerecord (3.2.1)
|
||||||
activemodel (= 3.2.0)
|
activemodel (= 3.2.1)
|
||||||
activesupport (= 3.2.0)
|
activesupport (= 3.2.1)
|
||||||
arel (~> 3.0.0)
|
arel (~> 3.0.0)
|
||||||
tzinfo (~> 0.3.29)
|
tzinfo (~> 0.3.29)
|
||||||
activeresource (3.2.0)
|
activeresource (3.2.1)
|
||||||
activemodel (= 3.2.0)
|
activemodel (= 3.2.1)
|
||||||
activesupport (= 3.2.0)
|
activesupport (= 3.2.1)
|
||||||
activesupport (3.2.0)
|
activesupport (3.2.1)
|
||||||
i18n (~> 0.6)
|
i18n (~> 0.6)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
arel (3.0.0)
|
arel (3.0.0)
|
||||||
@@ -115,17 +115,17 @@ GEM
|
|||||||
rack
|
rack
|
||||||
rack-test (0.6.1)
|
rack-test (0.6.1)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (3.2.0)
|
rails (3.2.1)
|
||||||
actionmailer (= 3.2.0)
|
actionmailer (= 3.2.1)
|
||||||
actionpack (= 3.2.0)
|
actionpack (= 3.2.1)
|
||||||
activerecord (= 3.2.0)
|
activerecord (= 3.2.1)
|
||||||
activeresource (= 3.2.0)
|
activeresource (= 3.2.1)
|
||||||
activesupport (= 3.2.0)
|
activesupport (= 3.2.1)
|
||||||
bundler (~> 1.0)
|
bundler (~> 1.0)
|
||||||
railties (= 3.2.0)
|
railties (= 3.2.1)
|
||||||
railties (3.2.0)
|
railties (3.2.1)
|
||||||
actionpack (= 3.2.0)
|
actionpack (= 3.2.1)
|
||||||
activesupport (= 3.2.0)
|
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)
|
||||||
@@ -187,7 +187,7 @@ DEPENDENCIES
|
|||||||
nokogiri
|
nokogiri
|
||||||
pg
|
pg
|
||||||
pry
|
pry
|
||||||
rails (= 3.2.0)
|
rails (= 3.2.1)
|
||||||
rmagick
|
rmagick
|
||||||
sanitize!
|
sanitize!
|
||||||
sass
|
sass
|
||||||
|
|||||||
@@ -71,6 +71,4 @@ class MockMemcache
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
silence_warnings do
|
MEMCACHE = MockMemcache.new
|
||||||
MEMCACHE = MockMemcache.new
|
|
||||||
end
|
|
||||||
|
|||||||
0
vendor/plugins/.gitkeep
vendored
0
vendor/plugins/.gitkeep
vendored
Reference in New Issue
Block a user