Unverified Commit 064b4093 authored by Benjamin Neff's avatar Benjamin Neff

Merge pull request #7537 from SuperTux88/update-gems

Update thor, coveralls and simplecov
parents 1bd630d8 47574bc3
......@@ -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".
#
......@@ -268,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
......@@ -299,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
......
......@@ -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)
......@@ -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)
......@@ -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,14 +883,13 @@ 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)
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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment