From 31fa6b8bde2873b7aacb8152ae14a82a20324d1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Fri, 26 Apr 2019 19:36:44 +0200 Subject: [PATCH] Upgrade Rails to 5.1 Note we need to upgrade the bullet gem, although another option would be to remove it completely. Now we don't need the rubocop rules for deprecated methods, since using them will raise an error and we'll be notified immediately. --- .rubocop.yml | 12 ------- Gemfile | 4 +-- Gemfile.lock | 99 ++++++++++++++++++++++++++-------------------------- 3 files changed, 51 insertions(+), 64 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 7c151d364..8fb963919 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -198,15 +198,6 @@ Performance/EndWith: Performance/StartWith: Enabled: true -Rails/ActionFilter: - Enabled: true - -Rails/ApplicationJob: - Enabled: true - -Rails/ApplicationRecord: - Enabled: true - Rails/CreateTableWithTimestamps: Enabled: true Exclude: @@ -241,9 +232,6 @@ Rails/HasManyOrHasOneDependent: Enabled: true Severity: refactor -Rails/HttpPositionalArguments: - Enabled: true - Rails/InverseOf: Enabled: true Exclude: diff --git a/Gemfile b/Gemfile index 9fcadcea9..716f7c21b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -gem "rails", "5.0.7.2" +gem "rails", "5.1.7" gem "acts-as-taggable-on", "~> 5.0.0" gem "acts_as_votable", "~> 0.11.1" @@ -66,7 +66,7 @@ source "https://rails-assets.org" do end group :development, :test do - gem "bullet", "~> 5.7.0" + gem "bullet", "~> 5.9.0" gem "byebug", "~> 10.0.0" gem "factory_bot_rails", "~> 4.8.2" gem "faker", "~> 1.8.7" diff --git a/Gemfile.lock b/Gemfile.lock index 22b2fc556..889d5e0cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,39 +10,39 @@ GEM remote: https://rubygems.org/ remote: https://rails-assets.org/ specs: - actioncable (5.0.7.2) - actionpack (= 5.0.7.2) - nio4r (>= 1.2, < 3.0) + actioncable (5.1.7) + actionpack (= 5.1.7) + nio4r (~> 2.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) + actionmailer (5.1.7) + actionpack (= 5.1.7) + actionview (= 5.1.7) + activejob (= 5.1.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.0.7.2) - actionview (= 5.0.7.2) - activesupport (= 5.0.7.2) + actionpack (5.1.7) + actionview (= 5.1.7) + activesupport (= 5.1.7) rack (~> 2.0) - rack-test (~> 0.6.3) + rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.0.7.2) - activesupport (= 5.0.7.2) + actionview (5.1.7) + activesupport (= 5.1.7) builder (~> 3.1) - erubis (~> 2.7.0) + erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.0.7.2) - activesupport (= 5.0.7.2) + activejob (5.1.7) + activesupport (= 5.1.7) 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) + activemodel (5.1.7) + activesupport (= 5.1.7) + activerecord (5.1.7) + activemodel (= 5.1.7) + activesupport (= 5.1.7) + arel (~> 8.0) + activesupport (5.1.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -70,7 +70,7 @@ GEM nokogiri ancestry (3.0.7) activerecord (>= 3.2.0) - arel (7.1.4) + arel (8.0.0) ast (2.4.0) audited (4.9.0) activerecord (>= 4.2, < 6.1) @@ -91,9 +91,9 @@ GEM smart_properties browser (2.5.3) builder (3.2.4) - bullet (5.7.1) + bullet (5.9.0) activesupport (>= 3.0.0) - uniform_notifier (~> 1.11.0) + uniform_notifier (~> 1.11) byebug (10.0.0) cancancan (2.3.0) capistrano (3.10.1) @@ -144,7 +144,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) coveralls (0.8.22) json (>= 1.8, < 3) simplecov (~> 0.16.1) @@ -210,7 +210,6 @@ GEM smart_properties errbase (0.0.3) erubi (1.8.0) - erubis (2.7.0) execjs (2.7.0) factory_bot (4.8.2) activesupport (>= 3.0.0) @@ -332,7 +331,7 @@ GEM kramdown (~> 1.12, >= 1.12.0) mixlib-cli (~> 1.7, >= 1.7.0) mixlib-config (~> 2.2, >= 2.2.1) - method_source (0.9.2) + method_source (1.0.0) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) @@ -351,7 +350,7 @@ GEM net-ssh (5.0.2) newrelic_rpm (4.1.0.333) nio4r (2.5.2) - nokogiri (1.10.8) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) nori (2.6.0) oauth (0.5.4) @@ -405,26 +404,26 @@ GEM public_suffix (4.0.1) puma (4.3.3) nio4r (~> 2.0) - rack (2.1.1) + rack (2.2.2) rack-accept (0.4.5) rack (>= 0.4) rack-attack (5.0.1) rack rack-proxy (0.6.5) rack - rack-test (0.6.3) - rack (>= 1.0) - 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) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (5.1.7) + actioncable (= 5.1.7) + actionmailer (= 5.1.7) + actionpack (= 5.1.7) + actionview (= 5.1.7) + activejob (= 5.1.7) + activemodel (= 5.1.7) + activerecord (= 5.1.7) + activesupport (= 5.1.7) bundler (>= 1.3.0) - railties (= 5.0.7.2) + railties (= 5.1.7) sprockets-rails (>= 2.0.0) rails-assets-leaflet (1.2.0) rails-assets-markdown-it (8.2.2) @@ -436,9 +435,9 @@ GEM 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) + railties (5.1.7) + actionpack (= 5.1.7) + activesupport (= 5.1.7) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -577,7 +576,7 @@ GEM uglifier (4.1.19) execjs (>= 0.3.0, < 3) unicode-display_width (1.6.0) - uniform_notifier (1.11.0) + uniform_notifier (1.13.0) user_agent_parser (2.6.0) uuidtools (2.1.5) warden (1.2.8) @@ -591,7 +590,7 @@ GEM railties (>= 4.2) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.3) + websocket-extensions (0.1.4) whenever (0.10.0) chronic (>= 0.6.3) wicked_pdf (1.1.0) @@ -609,7 +608,7 @@ DEPENDENCIES ancestry (~> 3.0.7) audited (~> 4.9.0) autoprefixer-rails (~> 8.2.0) - bullet (~> 5.7.0) + bullet (~> 5.9.0) byebug (~> 10.0.0) cancancan (~> 2.3.0) capistrano (~> 3.10.1) @@ -664,7 +663,7 @@ DEPENDENCIES pg (~> 0.21.0) pg_search (~> 2.0.1) puma (~> 4.3.3) - rails (= 5.0.7.2) + rails (= 5.1.7) rails-assets-leaflet! rails-assets-markdown-it (~> 8.2.1)! recipient_interceptor (~> 0.2.0)