Update rails to beta2
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
source 'https://rubygems.org'
|
||||
|
||||
gem 'rails', '4.2.0.beta1'
|
||||
gem 'rails', '4.2.0.beta2'
|
||||
gem 'rack-cors', :require => 'rack/cors'
|
||||
|
||||
# Bundle edge Rails instead:
|
||||
|
||||
+47
-41
@@ -1,6 +1,6 @@
|
||||
GIT
|
||||
remote: git://github.com/bterkuile/cmtool.git
|
||||
revision: f61f94c8831db5c8f73df0835ccfebe2a20c9f1f
|
||||
revision: 6afc9bdae9bf909b76f9a2de0846c84134292d5f
|
||||
specs:
|
||||
cmtool (1.0.0)
|
||||
bourbon
|
||||
@@ -37,7 +37,7 @@ GIT
|
||||
|
||||
GIT
|
||||
remote: git://github.com/plataformatec/devise.git
|
||||
revision: 8482e485d1396fdc43c030098f80c90f11763a3a
|
||||
revision: 1d8890b77372b9c4fd3ec8e9b4963d76774ed33c
|
||||
branch: lm-rails-4-2
|
||||
specs:
|
||||
devise (3.3.0)
|
||||
@@ -51,37 +51,39 @@ GIT
|
||||
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)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.3)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
||||
active_decorator (0.3.4)
|
||||
active_model_serializers (0.9.0)
|
||||
activemodel (>= 3.2)
|
||||
activejob (4.2.0.beta1)
|
||||
globalid (>= 0.2.3)
|
||||
activemodel (4.2.0.beta1)
|
||||
activesupport (= 4.2.0.beta1)
|
||||
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)
|
||||
@@ -239,6 +241,8 @@ GEM
|
||||
addressable (~> 2.3)
|
||||
letter_opener (1.2.0)
|
||||
launchy (~> 2.2)
|
||||
loofah (2.0.1)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.6.1)
|
||||
mime-types (>= 1.16, < 3)
|
||||
method_source (0.8.2)
|
||||
@@ -289,16 +293,16 @@ GEM
|
||||
rack-cors (0.2.9)
|
||||
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.3)
|
||||
activesupport (>= 4.2.0.alpha)
|
||||
@@ -306,9 +310,11 @@ GEM
|
||||
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)
|
||||
@@ -324,7 +330,7 @@ GEM
|
||||
rspec-core (~> 3.1.0)
|
||||
rspec-expectations (~> 3.1.0)
|
||||
rspec-mocks (~> 3.1.0)
|
||||
rspec-core (3.1.4)
|
||||
rspec-core (3.1.5)
|
||||
rspec-support (~> 3.1.0)
|
||||
rspec-expectations (3.1.2)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
@@ -385,10 +391,10 @@ GEM
|
||||
net-ssh (>= 2.8.0)
|
||||
subexec (0.2.3)
|
||||
temple (0.6.8)
|
||||
thin (1.6.2)
|
||||
daemons (>= 1.0.9)
|
||||
eventmachine (>= 1.0.0)
|
||||
rack (>= 1.0.0)
|
||||
thin (1.6.3)
|
||||
daemons (~> 1.0, >= 1.0.9)
|
||||
eventmachine (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
thor (0.19.1)
|
||||
thread_safe (0.3.4)
|
||||
tilt (1.4.1)
|
||||
@@ -451,7 +457,7 @@ DEPENDENCIES
|
||||
pry-rails
|
||||
quiet_assets
|
||||
rack-cors
|
||||
rails (= 4.2.0.beta1)
|
||||
rails (= 4.2.0.beta2)
|
||||
rqrcode
|
||||
rspec-its
|
||||
rspec-rails
|
||||
|
||||
Reference in New Issue
Block a user