Permalink
Browse files

Update to latest Rails

  • Loading branch information...
Pluies committed Oct 4, 2015
1 parent 930ba2a commit 9220ede82aefb001cbf9232689b41c10d55a7b59
Showing with 75 additions and 46 deletions.
  1. +2 −2 Gemfile
  2. +73 −44 Gemfile.lock
View
@@ -1,6 +1,6 @@
source 'http://rubygems.org'
source 'https://rubygems.org'
gem 'rails', '~> 4.0.0'
gem 'rails', '~> 4.2.0'
gem 'sass-rails'
gem 'coffee-rails'
gem 'uglifier'
View
@@ -1,41 +1,52 @@
GEM
remote: http://rubygems.org/
remote: https://rubygems.org/
specs:
ZenTest (4.11.0)
actionmailer (4.0.13)
actionpack (= 4.0.13)
actionmailer (4.2.4)
actionpack (= 4.2.4)
actionview (= 4.2.4)
activejob (= 4.2.4)
mail (~> 2.5, >= 2.5.4)
actionpack (4.0.13)
activesupport (= 4.0.13)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.4)
actionview (= 4.2.4)
activesupport (= 4.2.4)
rack (~> 1.6)
rack-test (~> 0.6.2)
activemodel (4.0.13)
activesupport (= 4.0.13)
builder (~> 3.1.0)
activerecord (4.0.13)
activemodel (= 4.0.13)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.13)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.4)
activesupport (4.0.13)
i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.4)
activesupport (= 4.2.4)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.4)
activesupport (= 4.2.4)
globalid (>= 0.3.0)
activemodel (4.2.4)
activesupport (= 4.2.4)
builder (~> 3.1)
activerecord (4.2.4)
activemodel (= 4.2.4)
activesupport (= 4.2.4)
arel (~> 6.0)
activesupport (4.2.4)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
ansi (1.5.0)
arel (4.0.2)
arel (6.0.3)
autotest (4.4.6)
ZenTest (>= 4.4.1)
autotest-inotify (0.0.6)
autotest (>= 4.2.4)
rb-inotify
autotest-rails-pure (4.1.2)
autotest-standalone (4.5.11)
builder (3.1.4)
builder (3.2.2)
capistrano (3.4.0)
i18n
rake (>= 10.0.0)
@@ -53,39 +64,57 @@ GEM
execjs (2.6.0)
ffi (1.9.10)
geocoder (1.2.11)
globalid (0.3.6)
activesupport (>= 4.1.0)
gmaps4rails (2.1.2)
http_accept_language (2.0.5)
i18n (0.7.0)
jquery-rails (3.1.4)
railties (>= 3.0, < 5.0)
jquery-rails (4.0.5)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
libv8 (3.16.14.11)
lodash-rails (3.10.1)
railties (>= 3.1)
loofah (2.0.3)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mime-types (2.6.2)
minitest (4.7.5)
multi_json (1.11.2)
mini_portile (0.6.2)
minitest (5.8.1)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (3.0.1)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
power_assert (0.2.4)
rack (1.5.5)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.0.13)
actionmailer (= 4.0.13)
actionpack (= 4.0.13)
activerecord (= 4.0.13)
activesupport (= 4.0.13)
rails (4.2.4)
actionmailer (= 4.2.4)
actionpack (= 4.2.4)
actionview (= 4.2.4)
activejob (= 4.2.4)
activemodel (= 4.2.4)
activerecord (= 4.2.4)
activesupport (= 4.2.4)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.13)
sprockets-rails (~> 2.0)
railties (4.0.13)
actionpack (= 4.0.13)
activesupport (= 4.0.13)
railties (= 4.2.4)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
railties (4.2.4)
actionpack (= 4.2.4)
activesupport (= 4.2.4)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
@@ -139,10 +168,10 @@ GEM
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.1)
turn (0.9.7)
turn (0.9.6)
ansi
minitest (~> 4)
tzinfo (0.3.45)
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
@@ -161,7 +190,7 @@ DEPENDENCIES
http_accept_language
jquery-rails
lodash-rails
rails (~> 4.0.0)
rails (~> 4.2.0)
rspec-rails
rvm
sass-rails

0 comments on commit 9220ede

Please sign in to comment.