Update to Rails 5
This commit is contained in:
Petko Bordjukov
parent
de87c64c05
commit
c463de1846
4
Gemfile
4
Gemfile
|
|
@ -1,6 +1,6 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
gem 'rails', '4.2.4'
|
gem 'rails', '5.0.0.1'
|
||||||
|
|
||||||
gem 'sqlite3'
|
gem 'sqlite3'
|
||||||
gem 'sass-rails'
|
gem 'sass-rails'
|
||||||
|
|
@ -11,7 +11,7 @@ gem 'coffee-rails'
|
||||||
gem 'jquery-rails'
|
gem 'jquery-rails'
|
||||||
gem 'jbuilder'
|
gem 'jbuilder'
|
||||||
|
|
||||||
gem 'activeresource', require: 'active_resource'
|
gem 'activeresource', github: 'rails/activeresource', require: 'active_resource'
|
||||||
|
|
||||||
gem 'pry-rails'
|
gem 'pry-rails'
|
||||||
|
|
||||||
|
|
|
||||||
220
Gemfile.lock
220
Gemfile.lock
|
|
@ -1,55 +1,72 @@
|
||||||
|
GIT
|
||||||
|
remote: git://github.com/rails/activeresource.git
|
||||||
|
revision: f8abaf13174e94d179227f352c9dd6fb8b03e0da
|
||||||
|
specs:
|
||||||
|
activeresource (5.0.0)
|
||||||
|
activemodel (> 4.2, < 6)
|
||||||
|
activemodel-serializers-xml (~> 1.0)
|
||||||
|
activesupport (> 4.2, < 6)
|
||||||
|
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.2.4)
|
actioncable (5.0.0.1)
|
||||||
actionpack (= 4.2.4)
|
actionpack (= 5.0.0.1)
|
||||||
actionview (= 4.2.4)
|
nio4r (~> 1.2)
|
||||||
activejob (= 4.2.4)
|
websocket-driver (~> 0.6.1)
|
||||||
|
actionmailer (5.0.0.1)
|
||||||
|
actionpack (= 5.0.0.1)
|
||||||
|
actionview (= 5.0.0.1)
|
||||||
|
activejob (= 5.0.0.1)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 2.0)
|
||||||
actionpack (4.2.4)
|
actionpack (5.0.0.1)
|
||||||
actionview (= 4.2.4)
|
actionview (= 5.0.0.1)
|
||||||
activesupport (= 4.2.4)
|
activesupport (= 5.0.0.1)
|
||||||
rack (~> 1.6)
|
rack (~> 2.0)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.3)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
actionview (4.2.4)
|
actionview (5.0.0.1)
|
||||||
activesupport (= 4.2.4)
|
activesupport (= 5.0.0.1)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
activejob (4.2.4)
|
activejob (5.0.0.1)
|
||||||
activesupport (= 4.2.4)
|
activesupport (= 5.0.0.1)
|
||||||
globalid (>= 0.3.0)
|
globalid (>= 0.3.6)
|
||||||
activemodel (4.2.4)
|
activemodel (5.0.0.1)
|
||||||
activesupport (= 4.2.4)
|
activesupport (= 5.0.0.1)
|
||||||
|
activemodel-serializers-xml (1.0.1)
|
||||||
|
activemodel (> 5.x)
|
||||||
|
activerecord (> 5.x)
|
||||||
|
activesupport (> 5.x)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
activerecord (4.2.4)
|
activerecord (5.0.0.1)
|
||||||
activemodel (= 4.2.4)
|
activemodel (= 5.0.0.1)
|
||||||
activesupport (= 4.2.4)
|
activesupport (= 5.0.0.1)
|
||||||
arel (~> 6.0)
|
arel (~> 7.0)
|
||||||
activeresource (4.0.0)
|
activesupport (5.0.0.1)
|
||||||
activemodel (~> 4.0)
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
activesupport (~> 4.0)
|
|
||||||
rails-observers (~> 0.1.1)
|
|
||||||
activesupport (4.2.4)
|
|
||||||
i18n (~> 0.7)
|
i18n (~> 0.7)
|
||||||
json (~> 1.7, >= 1.7.7)
|
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
thread_safe (~> 0.3, >= 0.3.4)
|
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
arel (6.0.3)
|
airbrussh (1.1.1)
|
||||||
|
sshkit (>= 1.6.1, != 1.7.0)
|
||||||
|
arel (7.1.2)
|
||||||
builder (3.2.2)
|
builder (3.2.2)
|
||||||
capistrano (3.4.0)
|
capistrano (3.6.1)
|
||||||
|
airbrussh (>= 1.0.0)
|
||||||
|
capistrano-harrow
|
||||||
i18n
|
i18n
|
||||||
rake (>= 10.0.0)
|
rake (>= 10.0.0)
|
||||||
sshkit (~> 1.3)
|
sshkit (>= 1.9.0)
|
||||||
capistrano-bundler (1.1.4)
|
capistrano-bundler (1.1.4)
|
||||||
capistrano (~> 3.1)
|
capistrano (~> 3.1)
|
||||||
sshkit (~> 1.2)
|
sshkit (~> 1.2)
|
||||||
capistrano-rails (1.1.3)
|
capistrano-harrow (0.5.3)
|
||||||
|
capistrano-rails (1.1.8)
|
||||||
capistrano (~> 3.1)
|
capistrano (~> 3.1)
|
||||||
capistrano-bundler (~> 1.1)
|
capistrano-bundler (~> 1.1)
|
||||||
capistrano-rvm (0.1.2)
|
capistrano-rvm (0.1.2)
|
||||||
|
|
@ -58,114 +75,117 @@ GEM
|
||||||
capistrano3-puma (1.2.1)
|
capistrano3-puma (1.2.1)
|
||||||
capistrano (~> 3.0)
|
capistrano (~> 3.0)
|
||||||
puma (>= 2.6)
|
puma (>= 2.6)
|
||||||
coderay (1.1.0)
|
coderay (1.1.1)
|
||||||
coffee-rails (4.1.0)
|
coffee-rails (4.2.1)
|
||||||
coffee-script (>= 2.2.0)
|
coffee-script (>= 2.2.0)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 5.2.x)
|
||||||
coffee-script (2.4.1)
|
coffee-script (2.4.1)
|
||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.9.1.1)
|
coffee-script-source (1.10.0)
|
||||||
colorize (0.7.7)
|
concurrent-ruby (1.0.2)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
execjs (2.6.0)
|
execjs (2.7.0)
|
||||||
globalid (0.3.6)
|
globalid (0.3.7)
|
||||||
activesupport (>= 4.1.0)
|
activesupport (>= 4.1.0)
|
||||||
i18n (0.7.0)
|
i18n (0.7.0)
|
||||||
jbuilder (2.3.2)
|
jbuilder (2.6.0)
|
||||||
activesupport (>= 3.0.0, < 5)
|
activesupport (>= 3.0.0, < 5.1)
|
||||||
multi_json (~> 1.2)
|
multi_json (~> 1.2)
|
||||||
jquery-rails (4.0.5)
|
jquery-rails (4.2.1)
|
||||||
rails-dom-testing (~> 1.0)
|
rails-dom-testing (>= 1, < 3)
|
||||||
railties (>= 4.2.0)
|
railties (>= 4.2.0)
|
||||||
thor (>= 0.14, < 2.0)
|
thor (>= 0.14, < 2.0)
|
||||||
json (1.8.3)
|
|
||||||
loofah (2.0.3)
|
loofah (2.0.3)
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.5.9)
|
||||||
mail (2.6.3)
|
mail (2.6.4)
|
||||||
mime-types (>= 1.16, < 3)
|
mime-types (>= 1.16, < 4)
|
||||||
method_source (0.8.2)
|
method_source (0.8.2)
|
||||||
mime-types (2.6.2)
|
mime-types (3.1)
|
||||||
mini_portile (0.6.2)
|
mime-types-data (~> 3.2015)
|
||||||
minitest (5.8.1)
|
mime-types-data (3.2016.0521)
|
||||||
multi_json (1.11.2)
|
mini_portile2 (2.1.0)
|
||||||
|
minitest (5.9.1)
|
||||||
|
multi_json (1.12.1)
|
||||||
net-scp (1.2.1)
|
net-scp (1.2.1)
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
net-ssh (3.0.1)
|
net-ssh (3.2.0)
|
||||||
nokogiri (1.6.6.2)
|
nio4r (1.2.1)
|
||||||
mini_portile (~> 0.6.0)
|
nokogiri (1.6.8)
|
||||||
pg (0.18.3)
|
mini_portile2 (~> 2.1.0)
|
||||||
pry (0.10.2)
|
pkg-config (~> 1.1.7)
|
||||||
|
pg (0.19.0)
|
||||||
|
pkg-config (1.1.7)
|
||||||
|
pry (0.10.4)
|
||||||
coderay (~> 1.1.0)
|
coderay (~> 1.1.0)
|
||||||
method_source (~> 0.8.1)
|
method_source (~> 0.8.1)
|
||||||
slop (~> 3.4)
|
slop (~> 3.4)
|
||||||
pry-rails (0.3.4)
|
pry-rails (0.3.4)
|
||||||
pry (>= 0.9.10)
|
pry (>= 0.9.10)
|
||||||
puma (2.14.0)
|
puma (3.6.0)
|
||||||
rack (1.6.4)
|
rack (2.0.1)
|
||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.2.4)
|
rails (5.0.0.1)
|
||||||
actionmailer (= 4.2.4)
|
actioncable (= 5.0.0.1)
|
||||||
actionpack (= 4.2.4)
|
actionmailer (= 5.0.0.1)
|
||||||
actionview (= 4.2.4)
|
actionpack (= 5.0.0.1)
|
||||||
activejob (= 4.2.4)
|
actionview (= 5.0.0.1)
|
||||||
activemodel (= 4.2.4)
|
activejob (= 5.0.0.1)
|
||||||
activerecord (= 4.2.4)
|
activemodel (= 5.0.0.1)
|
||||||
activesupport (= 4.2.4)
|
activerecord (= 5.0.0.1)
|
||||||
|
activesupport (= 5.0.0.1)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.2.4)
|
railties (= 5.0.0.1)
|
||||||
sprockets-rails
|
sprockets-rails (>= 2.0.0)
|
||||||
rails-deprecated_sanitizer (1.0.3)
|
rails-dom-testing (2.0.1)
|
||||||
activesupport (>= 4.2.0.alpha)
|
activesupport (>= 4.2.0, < 6.0)
|
||||||
rails-dom-testing (1.0.7)
|
|
||||||
activesupport (>= 4.2.0.beta, < 5.0)
|
|
||||||
nokogiri (~> 1.6.0)
|
nokogiri (~> 1.6.0)
|
||||||
rails-deprecated_sanitizer (>= 1.0.1)
|
rails-html-sanitizer (1.0.3)
|
||||||
rails-html-sanitizer (1.0.2)
|
|
||||||
loofah (~> 2.0)
|
loofah (~> 2.0)
|
||||||
rails-observers (0.1.2)
|
railties (5.0.0.1)
|
||||||
activemodel (~> 4.0)
|
actionpack (= 5.0.0.1)
|
||||||
railties (4.2.4)
|
activesupport (= 5.0.0.1)
|
||||||
actionpack (= 4.2.4)
|
method_source
|
||||||
activesupport (= 4.2.4)
|
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rake (10.4.2)
|
rake (11.3.0)
|
||||||
sass (3.4.18)
|
sass (3.4.22)
|
||||||
sass-rails (5.0.4)
|
sass-rails (5.0.6)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 6)
|
||||||
sass (~> 3.1)
|
sass (~> 3.1)
|
||||||
sprockets (>= 2.8, < 4.0)
|
sprockets (>= 2.8, < 4.0)
|
||||||
sprockets-rails (>= 2.0, < 4.0)
|
sprockets-rails (>= 2.0, < 4.0)
|
||||||
tilt (>= 1.1, < 3)
|
tilt (>= 1.1, < 3)
|
||||||
slop (3.6.0)
|
slop (3.6.0)
|
||||||
spring (1.4.0)
|
spring (1.7.2)
|
||||||
sprockets (3.3.5)
|
sprockets (3.7.0)
|
||||||
|
concurrent-ruby (~> 1.0)
|
||||||
rack (> 1, < 3)
|
rack (> 1, < 3)
|
||||||
sprockets-rails (2.3.3)
|
sprockets-rails (3.2.0)
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 4.0)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 4.0)
|
||||||
sprockets (>= 2.8, < 4.0)
|
sprockets (>= 3.0.0)
|
||||||
sqlite3 (1.3.10)
|
sqlite3 (1.3.11)
|
||||||
sshkit (1.7.1)
|
sshkit (1.11.3)
|
||||||
colorize (>= 0.7.0)
|
|
||||||
net-scp (>= 1.1.2)
|
net-scp (>= 1.1.2)
|
||||||
net-ssh (>= 2.8.0)
|
net-ssh (>= 2.8.0)
|
||||||
thor (0.19.1)
|
thor (0.19.1)
|
||||||
thread_safe (0.3.5)
|
thread_safe (0.3.5)
|
||||||
tilt (2.0.1)
|
tilt (2.0.5)
|
||||||
tzinfo (1.2.2)
|
tzinfo (1.2.2)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (2.7.2)
|
uglifier (3.0.2)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0, < 3)
|
||||||
json (>= 1.8.0)
|
websocket-driver (0.6.4)
|
||||||
|
websocket-extensions (>= 0.1.0)
|
||||||
|
websocket-extensions (0.1.2)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
activeresource
|
activeresource!
|
||||||
capistrano-rails
|
capistrano-rails
|
||||||
capistrano-rvm
|
capistrano-rvm
|
||||||
capistrano3-puma
|
capistrano3-puma
|
||||||
|
|
@ -175,11 +195,11 @@ DEPENDENCIES
|
||||||
pg
|
pg
|
||||||
pry-rails
|
pry-rails
|
||||||
puma
|
puma
|
||||||
rails (= 4.2.4)
|
rails (= 5.0.0.1)
|
||||||
sass-rails
|
sass-rails
|
||||||
spring
|
spring
|
||||||
sqlite3
|
sqlite3
|
||||||
uglifier
|
uglifier
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
1.10.6
|
1.12.5
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue