Merge branch 'update-coveralls' into 'master'

Update coveralls from 0.8.9 to 0.8.13 and simplecov from 0.10.0 to 0.11.2 This removes a few dependencies! It was also rude to be using coveralls 0.8.9, considering 0.8.12 introduced support for GitLab CI :) Also paves the way for updating mime-types to 3.0. Coveralls Changelog: https://github.com/lemurheavy/coveralls-ruby/releases Simplecov Changelog: https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md See merge request !3584

Merge branch 'update-coveralls' into 'master'
7266972b · Jeroen van Baarsen · f5fdf20d · 50ef9fca · 7266972b · 7266972b
Commit 7266972b authored Apr 07, 2016 by Jeroen van Baarsen
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 16 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +5 -15

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -290,7 +290,7 @@ group :development, :test do
  gem 'rubocop', '~> 0.38.0', require: false
  gem 'scss_lint', '~> 0.47.0', require: false
  gem 'coveralls',  '~> 0.8.2', require: false
-  gem 'simplecov', '~> 0.10.0', require: false
+  gem 'simplecov', '~> 0.11.0', require: false
  gem 'flog', require: false
  gem 'flay', require: false
  gem 'bundler-audit', require: false

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -136,10 +136,9 @@ GEM
    colorize (0.7.7)
    concurrent-ruby (1.0.0)
    connection_pool (2.2.0)
-    coveralls (0.8.9)
+    coveralls (0.8.13)
      json (~> 1.8)
-      rest-client (>= 1.6.8, < 2)
-      simplecov (~> 0.10.0)
+      simplecov (~> 0.11.0)
      term-ansicolor (~> 1.3)
      thor (~> 0.19.1)
      tins (~> 1.6.0)
@@ -176,8 +175,6 @@ GEM
    diff-lcs (1.2.5)
    diffy (3.0.7)
    docile (1.1.5)
-    domain_name (0.5.25)
-      unf (>= 0.0.5, < 1.0.0)
    doorkeeper (2.2.2)
      railties (>= 3.2)
    dropzonejs-rails (0.7.2)
@@ -421,8 +418,6 @@ GEM
      nokogiri (~> 1.6.0)
      ruby_parser (~> 3.5)
    htmlentities (4.3.4)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
    http_parser.rb (0.5.3)
    httparty (0.13.7)
      json (~> 1.8)
@@ -480,7 +475,6 @@ GEM
    nested_form (0.3.2)
    net-ldap (0.12.1)
    net-ssh (3.0.1)
-    netrc (0.11.0)
    newrelic_rpm (3.14.1.311)
    nokogiri (1.6.7.2)
      mini_portile2 (~> 2.0.0.rc2)
@@ -657,10 +651,6 @@ GEM
      listen (~> 3.0)
    responders (2.1.1)
      railties (>= 4.2.0, < 5.1)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
    rinku (1.7.3)
    rotp (2.1.1)
    rouge (1.10.1)
@@ -754,7 +744,7 @@ GEM
      rufus-scheduler (>= 2.0.24)
      sidekiq (>= 4.0.0)
    simple_oauth (0.1.9)
-    simplecov (0.10.0)
+    simplecov (0.11.2)
      docile (~> 1.1.0)
      json (~> 1.8)
      simplecov-html (~> 0.10.0)
@@ -845,7 +835,7 @@ GEM
    underscore-rails (1.8.3)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.7.1)
+    unf_ext (0.0.7.2)
    unicode-display_width (1.0.2)
    unicorn (4.9.0)
      kgio (~> 2.6)
@@ -1032,7 +1022,7 @@ DEPENDENCIES
  shoulda-matchers (~> 2.8.0)
  sidekiq (~> 4.0)
  sidekiq-cron (~> 0.4.0)
-  simplecov (~> 0.10.0)
+  simplecov (~> 0.11.0)
  sinatra (~> 1.4.4)
  six (~> 0.2.0)
  slack-notifier (~> 1.2.0)