Update rails dependency to version 3.1.0
This commit is contained in:
parent
5c248a8557
commit
264c29337d
2
Gemfile
2
Gemfile
|
@ -1,6 +1,6 @@
|
|||
source 'http://rubygems.org'
|
||||
|
||||
gem 'rails', '~> 3.1.0.rc6'
|
||||
gem 'rails', '~> 3.1.0'
|
||||
|
||||
gem 'arel'
|
||||
gem 'devise'
|
||||
|
|
56
Gemfile.lock
56
Gemfile.lock
|
@ -1,21 +1,21 @@
|
|||
GIT
|
||||
remote: git://github.com/sferik/rails_admin.git
|
||||
revision: 0e1b032bd747718458950be02a4fe893ab35f86c
|
||||
revision: c458f1424d1c44514e2ace7fd4bc342f04f614e6
|
||||
specs:
|
||||
rails_admin (0.0.1)
|
||||
builder (~> 3.0.0)
|
||||
haml (>= 3.1.0, < 3.3.0)
|
||||
rails (~> 3.1.0.rc6)
|
||||
rails (~> 3.1.0)
|
||||
|
||||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
actionmailer (3.1.0.rc8)
|
||||
actionpack (= 3.1.0.rc8)
|
||||
actionmailer (3.1.0)
|
||||
actionpack (= 3.1.0)
|
||||
mail (~> 2.3.0)
|
||||
actionpack (3.1.0.rc8)
|
||||
activemodel (= 3.1.0.rc8)
|
||||
activesupport (= 3.1.0.rc8)
|
||||
actionpack (3.1.0)
|
||||
activemodel (= 3.1.0)
|
||||
activesupport (= 3.1.0)
|
||||
builder (~> 3.0.0)
|
||||
erubis (~> 2.7.0)
|
||||
i18n (~> 0.6)
|
||||
|
@ -23,21 +23,21 @@ GEM
|
|||
rack-cache (~> 1.0.3)
|
||||
rack-mount (~> 0.8.2)
|
||||
rack-test (~> 0.6.1)
|
||||
sprockets (~> 2.0.0.beta.15)
|
||||
activemodel (3.1.0.rc8)
|
||||
activesupport (= 3.1.0.rc8)
|
||||
sprockets (~> 2.0.0)
|
||||
activemodel (3.1.0)
|
||||
activesupport (= 3.1.0)
|
||||
bcrypt-ruby (~> 3.0.0)
|
||||
builder (~> 3.0.0)
|
||||
i18n (~> 0.6)
|
||||
activerecord (3.1.0.rc8)
|
||||
activemodel (= 3.1.0.rc8)
|
||||
activesupport (= 3.1.0.rc8)
|
||||
activerecord (3.1.0)
|
||||
activemodel (= 3.1.0)
|
||||
activesupport (= 3.1.0)
|
||||
arel (~> 2.2.1)
|
||||
tzinfo (~> 0.3.29)
|
||||
activeresource (3.1.0.rc8)
|
||||
activemodel (= 3.1.0.rc8)
|
||||
activesupport (= 3.1.0.rc8)
|
||||
activesupport (3.1.0.rc8)
|
||||
activeresource (3.1.0)
|
||||
activemodel (= 3.1.0)
|
||||
activesupport (= 3.1.0)
|
||||
activesupport (3.1.0)
|
||||
multi_json (~> 1.0)
|
||||
addressable (2.2.6)
|
||||
arel (2.2.1)
|
||||
|
@ -82,17 +82,17 @@ GEM
|
|||
rack
|
||||
rack-test (0.6.1)
|
||||
rack (>= 1.0)
|
||||
rails (3.1.0.rc8)
|
||||
actionmailer (= 3.1.0.rc8)
|
||||
actionpack (= 3.1.0.rc8)
|
||||
activerecord (= 3.1.0.rc8)
|
||||
activeresource (= 3.1.0.rc8)
|
||||
activesupport (= 3.1.0.rc8)
|
||||
rails (3.1.0)
|
||||
actionmailer (= 3.1.0)
|
||||
actionpack (= 3.1.0)
|
||||
activerecord (= 3.1.0)
|
||||
activeresource (= 3.1.0)
|
||||
activesupport (= 3.1.0)
|
||||
bundler (~> 1.0)
|
||||
railties (= 3.1.0.rc8)
|
||||
railties (3.1.0.rc8)
|
||||
actionpack (= 3.1.0.rc8)
|
||||
activesupport (= 3.1.0.rc8)
|
||||
railties (= 3.1.0)
|
||||
railties (3.1.0)
|
||||
actionpack (= 3.1.0)
|
||||
activesupport (= 3.1.0)
|
||||
rack-ssl (~> 1.3.2)
|
||||
rake (>= 0.8.7)
|
||||
rdoc (~> 3.4)
|
||||
|
@ -141,7 +141,7 @@ DEPENDENCIES
|
|||
haml (~> 3.2.0.alpha)
|
||||
jruby-openssl
|
||||
pg
|
||||
rails (~> 3.1.0.rc6)
|
||||
rails (~> 3.1.0)
|
||||
rails_admin!
|
||||
simplecov
|
||||
sqlite3
|
||||
|
|
Loading…
Reference in New Issue