Update Rails dependency
This commit is contained in:
parent
7eeaac9db1
commit
1ed93cacd8
2
Gemfile
2
Gemfile
|
@ -2,7 +2,7 @@ source "https://rubygems.org"
|
|||
|
||||
gemspec
|
||||
|
||||
gem "rails", "4.2.0.beta1"
|
||||
gem "rails", "4.2.0.beta2"
|
||||
gem "omniauth", "~> 1.2.0"
|
||||
gem "omniauth-oauth2", "~> 1.1.0"
|
||||
gem "rdoc"
|
||||
|
|
84
Gemfile.lock
84
Gemfile.lock
|
@ -23,34 +23,36 @@ PATH
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actionmailer (4.2.0.beta1)
|
||||
actionpack (= 4.2.0.beta1)
|
||||
actionview (= 4.2.0.beta1)
|
||||
actionmailer (4.2.0.beta2)
|
||||
actionpack (= 4.2.0.beta2)
|
||||
actionview (= 4.2.0.beta2)
|
||||
activejob (= 4.2.0.beta2)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.2)
|
||||
actionpack (4.2.0.beta1)
|
||||
actionview (= 4.2.0.beta1)
|
||||
activesupport (= 4.2.0.beta1)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.3)
|
||||
actionpack (4.2.0.beta2)
|
||||
actionview (= 4.2.0.beta2)
|
||||
activesupport (= 4.2.0.beta2)
|
||||
rack (~> 1.6.0.beta)
|
||||
rack-test (~> 0.6.2)
|
||||
rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.2)
|
||||
actionview (4.2.0.beta1)
|
||||
activesupport (= 4.2.0.beta1)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.3)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
||||
actionview (4.2.0.beta2)
|
||||
activesupport (= 4.2.0.beta2)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.2)
|
||||
activejob (4.2.0.beta1)
|
||||
globalid (>= 0.2.3)
|
||||
activemodel (4.2.0.beta1)
|
||||
activesupport (= 4.2.0.beta1)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.3)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
||||
activejob (4.2.0.beta2)
|
||||
activesupport (= 4.2.0.beta2)
|
||||
globalid (>= 0.3.0)
|
||||
activemodel (4.2.0.beta2)
|
||||
activesupport (= 4.2.0.beta2)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.2.0.beta1)
|
||||
activemodel (= 4.2.0.beta1)
|
||||
activesupport (= 4.2.0.beta1)
|
||||
activerecord (4.2.0.beta2)
|
||||
activemodel (= 4.2.0.beta2)
|
||||
activesupport (= 4.2.0.beta2)
|
||||
arel (>= 6.0.0.beta1, < 6.1)
|
||||
activesupport (4.2.0.beta1)
|
||||
activesupport (4.2.0.beta2)
|
||||
i18n (>= 0.7.0.beta1, < 0.8)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
minitest (~> 5.1)
|
||||
|
@ -64,19 +66,21 @@ GEM
|
|||
erubis (2.7.0)
|
||||
faraday (0.9.0)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
globalid (0.2.3)
|
||||
globalid (0.3.0)
|
||||
activesupport (>= 4.1.0)
|
||||
hashie (3.2.0)
|
||||
hike (1.2.3)
|
||||
i18n (0.7.0.beta1)
|
||||
json (1.8.1)
|
||||
jwt (1.0.0)
|
||||
loofah (2.0.1)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.6.1)
|
||||
mime-types (>= 1.16, < 3)
|
||||
metaclass (0.0.4)
|
||||
mime-types (2.3)
|
||||
mini_portile (0.6.0)
|
||||
minitest (5.4.0)
|
||||
minitest (5.4.2)
|
||||
mocha (1.1.0)
|
||||
metaclass (~> 0.0.1)
|
||||
moped (2.0.0)
|
||||
|
@ -116,26 +120,28 @@ GEM
|
|||
ruby-openid (>= 2.1.8)
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rails (4.2.0.beta1)
|
||||
actionmailer (= 4.2.0.beta1)
|
||||
actionpack (= 4.2.0.beta1)
|
||||
actionview (= 4.2.0.beta1)
|
||||
activejob (= 4.2.0.beta1)
|
||||
activemodel (= 4.2.0.beta1)
|
||||
activerecord (= 4.2.0.beta1)
|
||||
activesupport (= 4.2.0.beta1)
|
||||
rails (4.2.0.beta2)
|
||||
actionmailer (= 4.2.0.beta2)
|
||||
actionpack (= 4.2.0.beta2)
|
||||
actionview (= 4.2.0.beta2)
|
||||
activejob (= 4.2.0.beta2)
|
||||
activemodel (= 4.2.0.beta2)
|
||||
activerecord (= 4.2.0.beta2)
|
||||
activesupport (= 4.2.0.beta2)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.2.0.beta1)
|
||||
railties (= 4.2.0.beta2)
|
||||
sprockets-rails (~> 3.0.0.beta1)
|
||||
rails-deprecated_sanitizer (1.0.2)
|
||||
rails-deprecated_sanitizer (1.0.3)
|
||||
activesupport (>= 4.2.0.alpha)
|
||||
rails-dom-testing (1.0.2)
|
||||
rails-dom-testing (1.0.3)
|
||||
activesupport
|
||||
nokogiri (~> 1.6.0)
|
||||
rails-deprecated_sanitizer (>= 1.0.1)
|
||||
railties (4.2.0.beta1)
|
||||
actionpack (= 4.2.0.beta1)
|
||||
activesupport (= 4.2.0.beta1)
|
||||
rails-html-sanitizer (1.0.1)
|
||||
loofah (~> 2.0)
|
||||
railties (4.2.0.beta2)
|
||||
actionpack (= 4.2.0.beta2)
|
||||
activesupport (= 4.2.0.beta2)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.3.2)
|
||||
|
@ -144,7 +150,7 @@ GEM
|
|||
responders (2.0.0)
|
||||
railties (>= 4.2.0.alpha, < 5)
|
||||
ruby-openid (2.5.0)
|
||||
sprockets (2.12.1)
|
||||
sprockets (2.12.2)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
|
@ -180,7 +186,7 @@ DEPENDENCIES
|
|||
omniauth-facebook
|
||||
omniauth-oauth2 (~> 1.1.0)
|
||||
omniauth-openid (~> 1.0.1)
|
||||
rails (= 4.2.0.beta1)
|
||||
rails (= 4.2.0.beta2)
|
||||
rdoc
|
||||
sqlite3
|
||||
webrat (= 0.7.3)
|
||||
|
|
Loading…
Reference in New Issue