Merge branch 'master' into dry-rb

socializer · Oct 11, 2019 · ffd58c7 · ffd58c7
2 parents 03ae546 + 651a770
commit ffd58c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -195,7 +195,7 @@ GEM
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     hashie (3.6.0)
-    highline (2.0.2)
+    highline (2.0.3)
     i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     i18n-tasks (0.9.29)
@@ -382,8 +382,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scss_lint (0.58.0)
-      rake (>= 0.9, < 13)
+    scss_lint (0.59.0)
       sass (~> 3.5, >= 3.5.5)
     selenium-webdriver (3.142.6)
       childprocess (>= 0.5, < 4.0)
@@ -459,7 +458,7 @@ DEPENDENCIES
   rubocop-performance (~> 1.5.0)
   rubocop-rails (~> 2.3.2)
   rubocop-rspec (~> 1.36.0)
-  scss_lint (~> 0.58.0)
+  scss_lint (~> 0.59.0)
   shoulda-matchers (~> 4.1.2)
   simplecov (~> 0.16.1)
   socializer!

diff --git a/socializer.gemspec b/socializer.gemspec
@@ -67,5 +67,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rubocop-performance",  "~> 1.5.0")
   s.add_development_dependency("rubocop-rails",        "~> 2.3.2")
   s.add_development_dependency("rubocop-rspec",        "~> 1.36.0")
-  s.add_development_dependency("scss_lint",            "~> 0.58.0")
+  s.add_development_dependency("scss_lint",            "~> 0.59.0")
 end