From 6ab333edf7693102dbb2f7db37f31b447aaa0930 Mon Sep 17 00:00:00 2001 From: Petko Bordjukov Date: Sun, 28 Apr 2019 01:34:56 +0300 Subject: [PATCH] Update to Rails 5.0 --- Gemfile | 11 ++-- Gemfile.lock | 178 ++++++++++++++++++++++++--------------------------- 2 files changed, 90 insertions(+), 99 deletions(-) diff --git a/Gemfile b/Gemfile index f99b268..d38900a 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,9 @@ source 'https://rubygems.org' -gem 'rails', '~> 4.2.11' +gem 'rails', '~> 5.0.1' -gem 'sqlite3', '~> 1.3.6' -gem 'pg', '~> 0.15' +gem 'sqlite3' +gem 'pg' gem 'sass-rails' @@ -31,11 +31,11 @@ gem 'carrierwave' gem "mini_magick" gem "refile", require: ['refile/rails', 'refile/simple_form'] -gem "refile-mini_magick" +gem "image_processing" gem 'puma', group: :production -gem 'globalize', '~> 5.0.1' +gem 'globalize', '~> 5.1.0' gem 'yaml_db' @@ -68,7 +68,6 @@ group :development do gem 'pry-rails' # gem 'hirb' gem 'awesome_print' - gem 'quiet_assets' gem 'capistrano' gem 'capistrano-rails' # gem 'capistrano-rvm' diff --git a/Gemfile.lock b/Gemfile.lock index 643bac8..efb4875 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,45 +1,48 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.11.1) - actionpack (= 4.2.11.1) - actionview (= 4.2.11.1) - activejob (= 4.2.11.1) + actioncable (5.0.7.2) + actionpack (= 5.0.7.2) + nio4r (>= 1.2, < 3.0) + websocket-driver (~> 0.6.1) + actionmailer (5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.11.1) - actionview (= 4.2.11.1) - activesupport (= 4.2.11.1) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) + actionpack (5.0.7.2) + actionview (= 5.0.7.2) + activesupport (= 5.0.7.2) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.11.1) - activesupport (= 4.2.11.1) + actionview (5.0.7.2) + activesupport (= 5.0.7.2) builder (~> 3.1) erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.11.1) - activesupport (= 4.2.11.1) - globalid (>= 0.3.0) - activemodel (4.2.11.1) - activesupport (= 4.2.11.1) - builder (~> 3.1) - activerecord (4.2.11.1) - activemodel (= 4.2.11.1) - activesupport (= 4.2.11.1) - arel (~> 6.0) - activesupport (4.2.11.1) - i18n (~> 0.7) + activejob (5.0.7.2) + activesupport (= 5.0.7.2) + globalid (>= 0.3.6) + activemodel (5.0.7.2) + activesupport (= 5.0.7.2) + activerecord (5.0.7.2) + activemodel (= 5.0.7.2) + activesupport (= 5.0.7.2) + arel (~> 7.0) + activesupport (5.0.7.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.6.0) public_suffix (>= 2.0.2, < 4.0) airbrussh (1.3.1) sshkit (>= 1.6.1, != 1.7.0) - arel (6.0.4) + arel (7.1.4) ast (2.4.0) autoprefixer-rails (9.5.1) execjs @@ -117,8 +120,6 @@ GEM devise (>= 4.6) diff-lcs (1.3) docile (1.3.1) - domain_name (0.5.20180417) - unf (>= 0.0.5, < 1.0.0) erubi (1.8.0) erubis (2.7.0) execjs (2.7.0) @@ -137,9 +138,10 @@ GEM formatador (0.2.5) globalid (0.4.2) activesupport (>= 4.2.0) - globalize (5.0.1) - activemodel (>= 4.2.0, < 4.3) - activerecord (>= 4.2.0, < 4.3) + globalize (5.1.0) + activemodel (>= 4.2, < 5.2) + activerecord (>= 4.2, < 5.2) + request_store (~> 1.0) guard (2.15.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) @@ -155,9 +157,7 @@ GEM guard-compat (~> 1.1) rspec (>= 2.99.0, < 4.0) highline (2.0.2) - http-cookie (1.0.3) - domain_name (~> 0.5) - i18n (0.9.5) + i18n (1.6.0) concurrent-ruby (~> 1.0) i18n-tasks (0.9.29) activesupport (>= 4.0.2) @@ -169,6 +169,9 @@ GEM rails-i18n rainbow (>= 2.2.2, < 4.0) terminal-table (>= 1.5.1) + image_processing (1.9.0) + mini_magick (>= 4.9.3, < 5) + ruby-vips (>= 2.0.13, < 3) jbuilder (2.8.0) activesupport (>= 4.2.0) multi_json (>= 1.2) @@ -211,6 +214,7 @@ GEM net-ssh (>= 2.6.5, < 6.0.0) net-ssh (5.2.0) netrc (0.11.0) + nio4r (2.3.1) nokogiri (1.10.3) mini_portile2 (~> 2.4.0) notiffany (0.1.1) @@ -219,7 +223,7 @@ GEM orm_adapter (0.5.0) parser (2.6.2.1) ast (~> 2.4.0) - pg (0.21.0) + pg (1.1.4) phony (2.15.49) phony_rails (0.14.11) activesupport (>= 3.0) @@ -231,30 +235,24 @@ GEM pry (>= 0.10.4) public_suffix (3.0.3) puma (3.12.1) - quiet_assets (1.1.0) - railties (>= 3.1, < 5.0) - rack (1.6.11) - rack-protection (1.5.5) - rack + rack (2.0.7) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.11.1) - actionmailer (= 4.2.11.1) - actionpack (= 4.2.11.1) - actionview (= 4.2.11.1) - activejob (= 4.2.11.1) - activemodel (= 4.2.11.1) - activerecord (= 4.2.11.1) - activesupport (= 4.2.11.1) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.11.1) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.9) - activesupport (>= 4.2.0, < 5.0) - nokogiri (~> 1.6) - rails-deprecated_sanitizer (>= 1.0.1) + rails (5.0.7.2) + actioncable (= 5.0.7.2) + actionmailer (= 5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) + activemodel (= 5.0.7.2) + activerecord (= 5.0.7.2) + activesupport (= 5.0.7.2) + bundler (>= 1.3.0) + railties (= 5.0.7.2) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) rails-erd (1.5.2) activerecord (>= 3.2) activesupport (>= 3.2) @@ -262,12 +260,13 @@ GEM ruby-graphviz (~> 1.2) rails-html-sanitizer (1.0.4) loofah (~> 2.2, >= 2.2.2) - rails-i18n (4.0.9) - i18n (~> 0.7) - railties (~> 4.0) - railties (4.2.11.1) - actionpack (= 4.2.11.1) - activesupport (= 4.2.11.1) + rails-i18n (5.1.3) + i18n (>= 0.7, < 2) + railties (>= 5.0, < 6) + railties (5.0.7.2) + actionpack (= 5.0.7.2) + activesupport (= 5.0.7.2) + method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) @@ -276,19 +275,15 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) - refile (0.6.2) - mime-types - rest-client (~> 1.8) - sinatra (~> 1.4.5) - refile-mini_magick (0.2.0) - mini_magick (~> 4.0) - refile (~> 0.5) + refile (0.3.0) + rest-client (~> 1.7.2) regexp_parser (1.4.0) + request_store (1.4.1) + rack (>= 1.4) responders (2.4.1) actionpack (>= 4.2.0, < 6.0) railties (>= 4.2.0, < 6.0) - rest-client (1.8.0) - http-cookie (>= 1.0.2, < 2.0) + rest-client (1.7.3) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) rqrcode (0.10.1) @@ -315,6 +310,8 @@ GEM rspec-support (~> 3.8.0) rspec-support (3.8.0) ruby-graphviz (1.2.4) + ruby-vips (2.0.13) + ffi (~> 1.9) ruby_dep (1.5.0) rubyzip (1.2.2) sass (3.7.4) @@ -336,18 +333,14 @@ GEM childprocess (>= 0.5, < 2.0) rubyzip (~> 1.2, >= 1.2.2) shellany (0.0.1) - simple_form (4.0.0) - actionpack (> 4) - activemodel (> 4) + simple_form (4.1.0) + actionpack (>= 5.0) + activemodel (>= 5.0) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sinatra (1.4.8) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) slim (4.0.1) temple (>= 0.7.6, < 0.9) tilt (>= 2.0.6, < 2.1) @@ -366,7 +359,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sqlite3 (1.3.13) + sqlite3 (1.4.0) sshkit (1.18.2) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) @@ -380,12 +373,12 @@ GEM thread_safe (~> 0.1) uglifier (4.1.20) execjs (>= 0.3.0, < 3) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.6) unicode-display_width (1.5.0) - warden (1.2.7) - rack (>= 1.0) + warden (1.2.8) + rack (>= 2.0.6) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.3) xpath (3.2.0) nokogiri (~> 1.8) yaml_db (0.7.0) @@ -419,9 +412,10 @@ DEPENDENCIES faker faraday font-awesome-sass (~> 4.6.2) - globalize (~> 5.0.1) + globalize (~> 5.1.0) guard-rspec i18n-tasks + image_processing jbuilder jquery-datatables-rails jquery-rails @@ -429,18 +423,16 @@ DEPENDENCIES mini_racer morrisjs-rails nested_form - pg (~> 0.15) + pg phony (~> 2.15.11) phony_rails pry-rails puma - quiet_assets - rails (~> 4.2.11) + rails (~> 5.0.1) rails-erd rails-i18n raphael-rails refile - refile-mini_magick rqrcode rspec-rails sass-rails @@ -451,7 +443,7 @@ DEPENDENCIES slim-rails spring spring-commands-rspec - sqlite3 (~> 1.3.6) + sqlite3 uglifier yaml_db