From b886ece4238bc5e157e3a9a57dc12076474b704e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Thu, 10 Dec 2015 18:18:22 +0100
Subject: [PATCH] bump pronto
---
Gemfile | 2 +-
Gemfile.lock | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/Gemfile b/Gemfile
index 374a8dad71..15a113af75 100644
--- 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
diff --git a/Gemfile.lock b/Gemfile.lock
index 65952d30ec..c9d6ab68f5 100644
--- 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)
--
GitLab