Update gems to Rails 4.1 (crashes!)
Lookin' good on this end, but the server isn't starting up yet, got some fixes to make!
This commit is contained in:
parent
537a8f0dc7
commit
b0219ddfef
37 changed files with 49 additions and 48 deletions
4
Gemfile
4
Gemfile
|
@ -4,7 +4,7 @@ ruby '2.2.4'
|
|||
gem 'dotenv-rails'
|
||||
gem 'dotenv-deployment'
|
||||
|
||||
gem 'rails', '= 4.0.13'
|
||||
gem 'rails', '= 4.1.16'
|
||||
#gem 'sqlite3-ruby', '~> 1.3.1', :require => 'sqlite3'
|
||||
gem 'mysql2', '>= 0.3.11'
|
||||
|
||||
|
@ -64,7 +64,7 @@ gem "letter_opener", :group => :development
|
|||
|
||||
gem 'sass-rails', '~> 5.0', '>= 5.0.7'
|
||||
gem 'compass-rails', '~> 3.1'
|
||||
gem 'uglifier', ">= 1.0.3"
|
||||
gem 'uglifier', '~> 4.2'
|
||||
|
||||
# Backfills for old Rails behaviors
|
||||
# TODO: Would be nice to become canonical and not need these!
|
||||
|
|
93
Gemfile.lock
93
Gemfile.lock
|
@ -20,41 +20,43 @@ GIT
|
|||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
actionmailer (4.0.13)
|
||||
actionpack (= 4.0.13)
|
||||
actionmailer (4.1.16)
|
||||
actionpack (= 4.1.16)
|
||||
actionview (= 4.1.16)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
actionpack (4.0.13)
|
||||
activesupport (= 4.0.13)
|
||||
builder (~> 3.1.0)
|
||||
erubis (~> 2.7.0)
|
||||
actionpack (4.1.16)
|
||||
actionview (= 4.1.16)
|
||||
activesupport (= 4.1.16)
|
||||
rack (~> 1.5.2)
|
||||
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)
|
||||
actionview (4.1.16)
|
||||
activesupport (= 4.1.16)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
activemodel (4.1.16)
|
||||
activesupport (= 4.1.16)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.1.16)
|
||||
activemodel (= 4.1.16)
|
||||
activesupport (= 4.1.16)
|
||||
arel (~> 5.0.0)
|
||||
activesupport (4.1.16)
|
||||
i18n (~> 0.6, >= 0.6.9)
|
||||
minitest (~> 4.2)
|
||||
multi_json (~> 1.3)
|
||||
json (~> 1.7, >= 1.7.7)
|
||||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (~> 0.3.37)
|
||||
tzinfo (~> 1.1)
|
||||
addressable (2.3.8)
|
||||
airbrake (3.1.17)
|
||||
builder
|
||||
multi_json
|
||||
arel (4.0.2)
|
||||
arel (5.0.1.20140414130214)
|
||||
babel-source (5.8.35)
|
||||
babel-transpiler (0.7.0)
|
||||
babel-source (>= 4.0, < 6)
|
||||
execjs (~> 2.0)
|
||||
bcrypt (3.1.19)
|
||||
builder (3.1.4)
|
||||
builder (3.2.4)
|
||||
capistrano (2.15.5)
|
||||
highline
|
||||
net-scp (>= 1.0.0)
|
||||
|
@ -127,10 +129,9 @@ GEM
|
|||
thor
|
||||
tilt
|
||||
highline (1.7.2)
|
||||
hike (1.2.3)
|
||||
i18n (0.9.5)
|
||||
concurrent-ruby (~> 1.0)
|
||||
json (2.5.1)
|
||||
json (1.8.6)
|
||||
launchy (2.4.3)
|
||||
addressable (~> 2.3)
|
||||
letter_opener (1.4.1)
|
||||
|
@ -142,9 +143,9 @@ GEM
|
|||
mini_magick (3.8.1)
|
||||
subexec (~> 0.2.1)
|
||||
mini_mime (1.1.2)
|
||||
minitest (4.7.5)
|
||||
minitest (5.15.0)
|
||||
msgpack (0.5.12)
|
||||
multi_json (1.3.7)
|
||||
multi_json (1.15.0)
|
||||
mysql2 (0.3.18)
|
||||
net-scp (1.0.4)
|
||||
net-ssh (>= 1.99.1)
|
||||
|
@ -166,22 +167,24 @@ GEM
|
|||
rack
|
||||
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.1.16)
|
||||
actionmailer (= 4.1.16)
|
||||
actionpack (= 4.1.16)
|
||||
actionview (= 4.1.16)
|
||||
activemodel (= 4.1.16)
|
||||
activerecord (= 4.1.16)
|
||||
activesupport (= 4.1.16)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.0.13)
|
||||
railties (= 4.1.16)
|
||||
sprockets-rails (~> 2.0)
|
||||
rails-i18n (4.0.9)
|
||||
i18n (~> 0.7)
|
||||
railties (~> 4.0)
|
||||
rails-observers (0.1.5)
|
||||
activemodel (>= 4.0)
|
||||
railties (4.0.13)
|
||||
actionpack (= 4.0.13)
|
||||
activesupport (= 4.0.13)
|
||||
railties (4.1.16)
|
||||
actionpack (= 4.1.16)
|
||||
activesupport (= 4.1.16)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (13.0.6)
|
||||
|
@ -246,11 +249,9 @@ GEM
|
|||
rack (~> 1.4)
|
||||
rack-protection (~> 1.4)
|
||||
tilt (>= 1.3, < 3)
|
||||
sprockets (2.12.5)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
sprockets (3.7.2)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
sprockets-rails (2.3.3)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
|
@ -261,11 +262,11 @@ GEM
|
|||
temple (0.8.2)
|
||||
thor (1.2.2)
|
||||
thread_safe (0.3.6)
|
||||
tilt (1.4.1)
|
||||
tzinfo (0.3.62)
|
||||
uglifier (2.7.1)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
tilt (2.2.0)
|
||||
tzinfo (1.2.11)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (4.2.0)
|
||||
execjs (>= 0.3.0, < 3)
|
||||
vegas (0.1.11)
|
||||
rack (>= 1.0.0)
|
||||
warden (1.2.7)
|
||||
|
@ -305,7 +306,7 @@ DEPENDENCIES
|
|||
parallel (~> 1.13.0)
|
||||
passenger_monit (~> 0.1.1)
|
||||
rack-attack (~> 2.2.0)
|
||||
rails (= 4.0.13)
|
||||
rails (= 4.1.16)
|
||||
rails-i18n (~> 4.0, >= 4.0.9)
|
||||
rails-observers (~> 0.1.5)
|
||||
rdiscount (~> 1.6.5)
|
||||
|
@ -320,7 +321,7 @@ DEPENDENCIES
|
|||
sanitize (~> 2.0.3)
|
||||
sass-rails (~> 5.0, >= 5.0.7)
|
||||
swf_converter (~> 0.0.3)
|
||||
uglifier (>= 1.0.3)
|
||||
uglifier (~> 4.2)
|
||||
whenever (~> 0.7.3)
|
||||
will_paginate (~> 3.0.pre2)
|
||||
|
||||
|
|
BIN
vendor/cache/actionmailer-4.0.13.gem
vendored
BIN
vendor/cache/actionmailer-4.0.13.gem
vendored
Binary file not shown.
BIN
vendor/cache/actionmailer-4.1.16.gem
vendored
Normal file
BIN
vendor/cache/actionmailer-4.1.16.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/actionpack-4.0.13.gem
vendored
BIN
vendor/cache/actionpack-4.0.13.gem
vendored
Binary file not shown.
BIN
vendor/cache/actionpack-4.1.16.gem
vendored
Normal file
BIN
vendor/cache/actionpack-4.1.16.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/actionview-4.1.16.gem
vendored
Normal file
BIN
vendor/cache/actionview-4.1.16.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/activemodel-4.0.13.gem
vendored
BIN
vendor/cache/activemodel-4.0.13.gem
vendored
Binary file not shown.
BIN
vendor/cache/activemodel-4.1.16.gem
vendored
Normal file
BIN
vendor/cache/activemodel-4.1.16.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/activerecord-4.0.13.gem
vendored
BIN
vendor/cache/activerecord-4.0.13.gem
vendored
Binary file not shown.
BIN
vendor/cache/activerecord-4.1.16.gem
vendored
Normal file
BIN
vendor/cache/activerecord-4.1.16.gem
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
vendor/cache/activesupport-4.0.13.gem
vendored
BIN
vendor/cache/activesupport-4.0.13.gem
vendored
Binary file not shown.
BIN
vendor/cache/activesupport-4.1.16.gem
vendored
Normal file
BIN
vendor/cache/activesupport-4.1.16.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/arel-4.0.2.gem
vendored
BIN
vendor/cache/arel-4.0.2.gem
vendored
Binary file not shown.
BIN
vendor/cache/arel-5.0.1.20140414130214.gem
vendored
Normal file
BIN
vendor/cache/arel-5.0.1.20140414130214.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/builder-3.1.4.gem
vendored
BIN
vendor/cache/builder-3.1.4.gem
vendored
Binary file not shown.
BIN
vendor/cache/builder-3.2.4.gem
vendored
Normal file
BIN
vendor/cache/builder-3.2.4.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/hike-1.2.3.gem
vendored
BIN
vendor/cache/hike-1.2.3.gem
vendored
Binary file not shown.
BIN
vendor/cache/json-1.8.6.gem
vendored
Normal file
BIN
vendor/cache/json-1.8.6.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/json-2.5.1.gem
vendored
BIN
vendor/cache/json-2.5.1.gem
vendored
Binary file not shown.
BIN
vendor/cache/minitest-4.7.5.gem
vendored
BIN
vendor/cache/minitest-4.7.5.gem
vendored
Binary file not shown.
BIN
vendor/cache/minitest-5.15.0.gem
vendored
Normal file
BIN
vendor/cache/minitest-5.15.0.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/multi_json-1.15.0.gem
vendored
Normal file
BIN
vendor/cache/multi_json-1.15.0.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/multi_json-1.3.7.gem
vendored
BIN
vendor/cache/multi_json-1.3.7.gem
vendored
Binary file not shown.
BIN
vendor/cache/rails-4.0.13.gem
vendored
BIN
vendor/cache/rails-4.0.13.gem
vendored
Binary file not shown.
BIN
vendor/cache/rails-4.1.16.gem
vendored
Normal file
BIN
vendor/cache/rails-4.1.16.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/railties-4.0.13.gem
vendored
BIN
vendor/cache/railties-4.0.13.gem
vendored
Binary file not shown.
BIN
vendor/cache/railties-4.1.16.gem
vendored
Normal file
BIN
vendor/cache/railties-4.1.16.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/sprockets-2.12.5.gem
vendored
BIN
vendor/cache/sprockets-2.12.5.gem
vendored
Binary file not shown.
BIN
vendor/cache/sprockets-3.7.2.gem
vendored
Normal file
BIN
vendor/cache/sprockets-3.7.2.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/tilt-1.4.1.gem
vendored
BIN
vendor/cache/tilt-1.4.1.gem
vendored
Binary file not shown.
BIN
vendor/cache/tilt-2.2.0.gem
vendored
Normal file
BIN
vendor/cache/tilt-2.2.0.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/tzinfo-0.3.62.gem
vendored
BIN
vendor/cache/tzinfo-0.3.62.gem
vendored
Binary file not shown.
BIN
vendor/cache/tzinfo-1.2.11.gem
vendored
Normal file
BIN
vendor/cache/tzinfo-1.2.11.gem
vendored
Normal file
Binary file not shown.
BIN
vendor/cache/uglifier-2.7.1.gem
vendored
BIN
vendor/cache/uglifier-2.7.1.gem
vendored
Binary file not shown.
BIN
vendor/cache/uglifier-4.2.0.gem
vendored
Normal file
BIN
vendor/cache/uglifier-4.2.0.gem
vendored
Normal file
Binary file not shown.
Loading…
Reference in a new issue