From aef554d5535fdbb2b34f58bae546ff1b1cac0f22 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <mjankowski@thoughtbot.com>
Date: Mon, 8 May 2017 12:55:42 -0400
Subject: [PATCH] Misc gem bumps (#2919)

* Update bundler-audit to version 0.5.0

* Update oj to version 3.0.6

* Update http-form_data to version 1.0.2

* Update parallel to version 1.11.2

* Update rails-i18n to version 5.0.4

* Update rack-protection to version 2.0.0

* Update haml to version 5.0.1

* Update scss_lint to version 0.53.0

* Relax requirement on i18n-tasks

* Remove haml and haml_lint gem requirement
---
 Gemfile      |  9 ++++-----
 Gemfile.lock | 39 +++++++++++++++------------------------
 2 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/Gemfile b/Gemfile
index efc227646e..47133345ea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -61,7 +61,7 @@ gem 'webpacker', '~>1.2'
 group :development, :test do
   gem 'fabrication'
   gem 'fuubar'
-  gem 'i18n-tasks', '~> 0.9.6'
+  gem 'i18n-tasks'
   gem 'pry-rails'
   gem 'rspec-rails'
 end
@@ -85,11 +85,10 @@ group :development do
   gem 'bullet'
   gem 'letter_opener'
   gem 'letter_opener_web'
-  gem 'rubocop', '0.46.0', require: false
+  gem 'rubocop', require: false
   gem 'brakeman', '~> 3.6.0', require: false
-  gem 'bundler-audit', '~> 0.4.0', require: false
-  gem 'scss_lint', '0.42.2', require: false
-  gem 'haml_lint', '~> 0.19.0', require: false
+  gem 'bundler-audit', require: false
+  gem 'scss_lint', require: false
 
   gem 'capistrano', '3.8.0'
   gem 'capistrano-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index d0888c177d..9269b779e1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,7 +72,7 @@ GEM
     bullet (5.5.1)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.10.0)
-    bundler-audit (0.4.0)
+    bundler-audit (0.5.0)
       bundler (~> 1.2)
       thor (~> 0.18)
     capistrano (3.8.0)
@@ -157,13 +157,6 @@ GEM
       addressable (~> 2.4)
       http (~> 2.0)
       nokogiri (~> 1.6)
-    haml (4.0.7)
-      tilt
-    haml_lint (0.19.0)
-      haml (~> 4.0)
-      rake (>= 10, < 13)
-      rubocop (>= 0.36.0)
-      sysexits (~> 1.1)
     hamlit (2.8.1)
       temple (>= 0.8.0)
       thor
@@ -184,7 +177,7 @@ GEM
       http_parser.rb (~> 0.6.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (1.0.1)
+    http-form_data (1.0.2)
     http_accept_language (2.1.0)
     http_parser.rb (0.6.0)
     httplog (0.99.3)
@@ -252,7 +245,7 @@ GEM
       mini_portile2 (~> 2.1.0)
     nokogumbo (1.4.10)
       nokogiri
-    oj (3.0.5)
+    oj (3.0.6)
     openssl (2.0.3)
     orm_adapter (0.5.0)
     ostatus2 (2.0.0)
@@ -270,7 +263,7 @@ GEM
     paperclip-av-transcoder (0.6.4)
       av (~> 0.9.0)
       paperclip (>= 2.5.2)
-    parallel (1.11.1)
+    parallel (1.11.2)
     parallel_tests (2.14.1)
       parallel
     parser (2.4.0.0)
@@ -294,7 +287,7 @@ GEM
     rack-attack (5.0.1)
       rack
     rack-cors (0.4.1)
-    rack-protection (1.5.3)
+    rack-protection (2.0.0)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -320,7 +313,7 @@ GEM
       nokogiri (~> 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    rails-i18n (5.0.3)
+    rails-i18n (5.0.4)
       i18n (~> 0.7)
       railties (~> 5.0)
     rails-settings-cached (0.6.5)
@@ -384,8 +377,8 @@ GEM
       rspec-core (~> 3.0, >= 3.0.0)
       sidekiq (>= 2.4.0)
     rspec-support (3.6.0)
-    rubocop (0.46.0)
-      parser (>= 2.3.1.1, < 3.0)
+    rubocop (0.48.1)
+      parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
@@ -400,9 +393,9 @@ GEM
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
     sass (3.4.23)
-    scss_lint (0.42.2)
-      rainbow (~> 2.0)
-      sass (~> 3.4.15)
+    scss_lint (0.53.0)
+      rake (>= 0.9, < 13)
+      sass (~> 3.4.20)
     sidekiq (5.0.0)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
@@ -438,7 +431,6 @@ GEM
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     statsd-instrument (2.1.2)
-    sysexits (1.2.0)
     temple (0.8.0)
     terminal-table (1.7.3)
       unicode-display_width (~> 1.1.1)
@@ -487,7 +479,7 @@ DEPENDENCIES
   binding_of_caller
   brakeman (~> 3.6.0)
   bullet
-  bundler-audit (~> 0.4.0)
+  bundler-audit
   capistrano (= 3.8.0)
   capistrano-rails
   capistrano-rbenv
@@ -503,14 +495,13 @@ DEPENDENCIES
   fast_blank
   fuubar
   goldfinger
-  haml_lint (~> 0.19.0)
   hamlit-rails
   hiredis
   htmlentities
   http
   http_accept_language
   httplog
-  i18n-tasks (~> 0.9.6)
+  i18n-tasks
   kaminari
   letter_opener
   letter_opener_web
@@ -544,10 +535,10 @@ DEPENDENCIES
   rqrcode
   rspec-rails
   rspec-sidekiq
-  rubocop (= 0.46.0)
+  rubocop
   ruby-oembed
   sanitize
-  scss_lint (= 0.42.2)
+  scss_lint
   sidekiq
   sidekiq-scheduler
   sidekiq-unique-jobs