github-migration
/
engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump rails to 3.0.12. Fixes #328.

This commit is contained in:
Mario Visic 2012-03-24 21:19:54 +08:00
parent 9077390db7
commit 86345b281d
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -4,7 +4,7 @@ source :rubygems
gem 'rake', '0.9.2' gem 'rake', '0.9.2'
gem 'rails', '3.0.10' gem 'rails', '3.0.12'
gem 'warden' gem 'warden'
gem 'devise', '~>1.5.0' gem 'devise', '~>1.5.0'

56
Gemfile.lock
View File

@ -9,34 +9,34 @@ GEM
SystemTimer (1.2.3) SystemTimer (1.2.3)
ZenTest (4.6.2) ZenTest (4.6.2)
abstract (1.0.0) abstract (1.0.0)
actionmailer (3.0.10) actionmailer (3.0.12)
actionpack (= 3.0.10) actionpack (= 3.0.12)
mail (~> 2.2.19) mail (~> 2.2.19)
actionmailer-with-request (0.3.0) actionmailer-with-request (0.3.0)
rails (>= 3) rails (>= 3)
actionpack (3.0.10) actionpack (3.0.12)
activemodel (= 3.0.10) activemodel (= 3.0.12)
activesupport (= 3.0.10) activesupport (= 3.0.12)
builder (~> 2.1.2) builder (~> 2.1.2)
erubis (~> 2.6.6) erubis (~> 2.6.6)
i18n (~> 0.5.0) i18n (~> 0.5.0)
rack (~> 1.2.1) rack (~> 1.2.5)
rack-mount (~> 0.6.14) rack-mount (~> 0.6.14)
rack-test (~> 0.5.7) rack-test (~> 0.5.7)
tzinfo (~> 0.3.23) tzinfo (~> 0.3.23)
activemodel (3.0.10) activemodel (3.0.12)
activesupport (= 3.0.10) activesupport (= 3.0.12)
builder (~> 2.1.2) builder (~> 2.1.2)
i18n (~> 0.5.0) i18n (~> 0.5.0)
activerecord (3.0.10) activerecord (3.0.12)
activemodel (= 3.0.10) activemodel (= 3.0.12)
activesupport (= 3.0.10) activesupport (= 3.0.12)
arel (~> 2.0.10) arel (~> 2.0.10)
tzinfo (~> 0.3.23) tzinfo (~> 0.3.23)
activeresource (3.0.10) activeresource (3.0.12)
activemodel (= 3.0.10) activemodel (= 3.0.12)
activesupport (= 3.0.10) activesupport (= 3.0.12)
activesupport (3.0.10) activesupport (3.0.12)
archive-tar-minitar (0.5.2) archive-tar-minitar (0.5.2)
arel (2.0.10) arel (2.0.10)
autotest (4.4.6) autotest (4.4.6)
@ -166,7 +166,7 @@ GEM
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.18)
mimemagic (0.1.8) mimemagic (0.1.8)
mimetype-fu (0.1.2) mimetype-fu (0.1.2)
mocha (0.9.12) mocha (0.9.12)
@ -193,17 +193,17 @@ GEM
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (0.5.7) rack-test (0.5.7)
rack (>= 1.0) rack (>= 1.0)
rails (3.0.10) rails (3.0.12)
actionmailer (= 3.0.10) actionmailer (= 3.0.12)
actionpack (= 3.0.10) actionpack (= 3.0.12)
activerecord (= 3.0.10) activerecord (= 3.0.12)
activeresource (= 3.0.10) activeresource (= 3.0.12)
activesupport (= 3.0.10) activesupport (= 3.0.12)
bundler (~> 1.0) bundler (~> 1.0)
railties (= 3.0.10) railties (= 3.0.12)
railties (3.0.10) railties (3.0.12)
actionpack (= 3.0.10) actionpack (= 3.0.12)
activesupport (= 3.0.10) activesupport (= 3.0.12)
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
thor (~> 0.14.4) thor (~> 0.14.4)
@ -267,7 +267,7 @@ GEM
treetop (1.4.10) treetop (1.4.10)
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.31) tzinfo (0.3.32)
unicorn (4.1.1) unicorn (4.1.1)
kgio (~> 2.4) kgio (~> 2.4)
rack rack
@ -324,7 +324,7 @@ DEPENDENCIES
mongoid (~> 2.0.2) mongoid (~> 2.0.2)
pickle pickle
rack-cache rack-cache
rails (= 3.0.10) rails (= 3.0.12)
rake (= 0.9.2) rake (= 0.9.2)
rmagick (= 2.12.2) rmagick (= 2.12.2)
rspec-cells rspec-cells

2
locomotive_cms.gemspec
View File

@ -17,7 +17,7 @@ Gem::Specification.new do |s|
s.required_rubygems_version = '>= 1.3.6' s.required_rubygems_version = '>= 1.3.6'
s.rubyforge_project = 'nowarning' s.rubyforge_project = 'nowarning'
s.add_dependency 'rails', '~> 3.0.10' s.add_dependency 'rails', '~> 3.0.12'
s.add_dependency 'warden' s.add_dependency 'warden'
s.add_dependency 'devise', '~>1.5.0' s.add_dependency 'devise', '~>1.5.0'
s.add_dependency 'devise_bushido_authenticatable', '1.0.0.alpha10' s.add_dependency 'devise_bushido_authenticatable', '1.0.0.alpha10'