Merge branch 'release-1.1.1'

Gemfile

@@ -39,7 +39,7 @@ group :development, :test do
   # console
   gem 'byebug', platforms: %i[mri mingw x64_mingw]
   # Adds support for Capybara system testing and selenium driver
-  gem 'capybara', '~> 2.13'
+  gem 'capybara', '~> 3.8'
   gem 'selenium-webdriver'
 end
 
@@ -79,7 +79,7 @@ gem 'ice_cube'
 gem 'js-routes'
 gem 'kaminari'
 gem 'local_time'
-gem 'paperclip', '~> 6.0.0'
+gem 'paperclip', '~> 6.1.0'
 gem 'searchkick'
 gem 'sidekiq'
 gem 'wdm', '>= 0.1.0' if Gem.win_platform?

Gemfile.lock

@@ -72,13 +72,13 @@ GEM
       sshkit (~> 1.2)
     capistrano3-unicorn (0.2.1)
       capistrano (~> 3.1, >= 3.1.0)
-    capybara (2.18.0)
+    capybara (3.8.2)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (>= 2.0, < 4.0)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      xpath (~> 3.1)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     climate_control (0.2.0)
@@ -173,7 +173,7 @@ GEM
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     orm_adapter (0.5.0)
-    paperclip (6.0.0)
+    paperclip (6.1.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
       mime-types
@@ -227,7 +227,7 @@ GEM
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
-    rubocop (0.59.1)
+    rubocop (0.59.2)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
@@ -238,7 +238,7 @@ GEM
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
     rubyzip (1.2.2)
-    sass (3.5.7)
+    sass (3.6.0)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -249,10 +249,10 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    scss_lint (0.57.0)
+    scss_lint (0.57.1)
       rake (>= 0.9, < 13)
-      sass (~> 3.5.5)
-    searchkick (3.1.1)
+      sass (~> 3.5, >= 3.5.5)
+    searchkick (3.1.2)
       activemodel (>= 4.2)
       elasticsearch (>= 5)
       hashie
@@ -324,7 +324,7 @@ DEPENDENCIES
   capistrano-rails (~> 1.3)
   capistrano-rvm
   capistrano3-unicorn
-  capybara (~> 2.13)
+  capybara (~> 3.8)
   coffee-rails (~> 4.2)
   connection_pool
   devise
@@ -337,7 +337,7 @@ DEPENDENCIES
   letter_opener
   listen (>= 3.0.5, < 3.2)
   local_time
-  paperclip (~> 6.0.0)
+  paperclip (~> 6.1.0)
   pg (~> 1.1)
   puma (~> 3.7)
   rails (~> 5.2.0)