From 907e221f24a8e6335e46b3a40ef30c6cf344cfaa Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 14 Aug 2017 03:04:05 +0200 Subject: [PATCH 1/2] Unlock thor again It looks like all commands we use in production fixed the warnings (rails 5.1), so we can update that again. --- Gemfile | 6 ------ Gemfile.lock | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index a06740129..6d8e3afff 100644 --- a/Gemfile +++ b/Gemfile @@ -206,12 +206,6 @@ gem "minitest" gem "versionist", "1.6.0" -# Prevent accidental upgrades of thor -# TODO: remove this when either all gems depending on thor have fixed the warnings -# or thor released a version where they are clearly marked as warnings -# see: https://github.com/erikhuda/thor/issues/538 -gem "thor", "0.19.1" - # Windows and OSX have an execjs compatible runtime built-in, Linux users should # install Node.js or use "therubyracer". # diff --git a/Gemfile.lock b/Gemfile.lock index e2ac7ba50..97896d5bf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -690,7 +690,7 @@ GEM tins (~> 1.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - thor (0.19.1) + thor (0.19.4) thread_safe (0.3.6) tilt (2.0.8) timecop (0.9.1) @@ -890,7 +890,6 @@ DEPENDENCIES spring-commands-rspec (= 1.0.4) sprockets-rails (= 3.2.0) string-direction (= 1.2.0) - thor (= 0.19.1) timecop (= 0.9.1) turbo_dev_assets (= 0.0.2) twitter (= 6.1.0) From 47574bc3245d64cdfe09b834b2010d8d0eb06efb Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 14 Aug 2017 03:15:21 +0200 Subject: [PATCH 2/2] Bump coveralls and simplecov --- Gemfile | 4 ++-- Gemfile.lock | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 6d8e3afff..532d4dd9e 100644 --- a/Gemfile +++ b/Gemfile @@ -262,7 +262,7 @@ group :development do gem "pry-byebug" # test coverage - gem "simplecov", "0.12.0", require: false + gem "simplecov", "0.14.1", require: false gem "turbo_dev_assets", "0.0.2" end @@ -293,7 +293,7 @@ group :test do gem "diaspora_federation-test", "0.2.1" # Coverage - gem 'coveralls', require: false + gem "coveralls", "0.8.21", require: false end group :development, :test do diff --git a/Gemfile.lock b/Gemfile.lock index 97896d5bf..5bc4f2ec5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -125,11 +125,11 @@ GEM concurrent-ruby (1.0.5) configurate (0.3.1) connection_pool (2.2.1) - coveralls (0.8.19) + coveralls (0.8.21) json (>= 1.8, < 3) - simplecov (~> 0.12.0) + simplecov (~> 0.14.1) term-ansicolor (~> 1.3) - thor (~> 0.19.1) + thor (~> 0.19.4) tins (~> 1.6) crack (0.4.3) safe_yaml (~> 1.0.0) @@ -653,7 +653,7 @@ GEM simple_captcha2 (0.4.3) rails (>= 4.1) simple_oauth (0.3.1) - simplecov (0.12.0) + simplecov (0.14.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) @@ -776,7 +776,7 @@ DEPENDENCIES carrierwave (= 1.1.0) compass-rails (= 3.0.2) configurate (= 0.3.1) - coveralls + coveralls (= 0.8.21) cucumber-api-steps (= 0.13) cucumber-rails (= 1.5.0) database_cleaner (= 1.6.1) @@ -883,7 +883,7 @@ DEPENDENCIES sidekiq (= 5.0.4) sidekiq-cron (= 0.6.3) simple_captcha2 (= 0.4.3) - simplecov (= 0.12.0) + simplecov (= 0.14.1) sinon-rails (= 1.15.0) spring (= 2.0.2) spring-commands-cucumber (= 1.0.1)