Merge branch 'hotfix/1.1.2'

Gemfile

@@ -100,7 +100,8 @@ group :development, :test do
   gem 'rubocop-rspec', require: false
   gem 'seed_dump'
   gem 'shoulda-matchers'
-  gem 'simplecov', require: false
+  # locking until https://github.com/codeclimate/test-reporter/issues/418 is resolved
+  gem 'simplecov', '0.17.1', require: false
   gem 'spring'
   gem 'spring-watcher-listen'
 end

Gemfile.lock

@@ -411,10 +411,11 @@ GEM
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     simple_oauth (0.3.1)
-    simplecov (0.18.1)
+    simplecov (0.17.1)
       docile (~> 1.1)
-      simplecov-html (~> 0.11.0)
-    simplecov-html (0.11.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
     spring (2.1.0)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
@@ -538,7 +539,7 @@ DEPENDENCIES
   sentry-raven
   shoulda-matchers
   sidekiq
-  simplecov
+  simplecov (= 0.17.1)
   spring
   spring-watcher-listen
   telegram-bot-ruby