bump pronto

b886ece4 · Jonne Haß · Dennis Schubert · 89482983 · b886ece4 · b886ece4
Commit b886ece4 authored Dec 10, 2015 by Jonne Haß Committed by Dennis Schubert Dec 31, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 6 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +6 -5

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -232,7 +232,7 @@ group :development do

  # Linters
  gem "jshintrb", "0.3.0"
-  gem "rubocop",  "0.34.2"
+  gem "rubocop",  "0.35.1"

  # Preloading environment


--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,7 +54,7 @@ GEM
      activemodel
      fog (>= 1.8.0)
      unf
-    ast (2.0.0)
+    ast (2.2.0)
    astrolabe (1.3.1)
      parser (~> 2.2)
    autoprefixer-rails (6.2.2)
@@ -651,12 +651,13 @@ GEM
      rspec-mocks (~> 3.3.0)
      rspec-support (~> 3.3.0)
    rspec-support (3.3.0)
-    rubocop (0.34.2)
+    rubocop (0.35.1)
      astrolabe (~> 1.3)
-      parser (>= 2.2.2.5, < 3.0)
+      parser (>= 2.2.3.0, < 3.0)
      powerpack (~> 0.1)
      rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
+      ruby-progressbar (~> 1.7)
+      tins (<= 1.6.0)
    ruby-oembed (0.8.14)
    ruby-progressbar (1.7.5)
    rubyzip (1.1.7)
@@ -876,7 +877,7 @@ DEPENDENCIES
  roxml (= 3.1.6)
  rspec-instafail (= 0.4.0)
  rspec-rails (= 3.3.3)
-  rubocop (= 0.34.2)
+  rubocop (= 0.35.1)
  ruby-oembed (= 0.8.14)
  rubyzip (= 1.1.7)
  sass-rails (= 5.0.4)