aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortoshimaru <me@toshimaru.net>2017-01-16 15:34:30 +0900
committertoshimaru <me@toshimaru.net>2017-01-16 15:34:30 +0900
commit6e30114c0a2df3cd12b054675a2cb682c25d0783 (patch)
tree5c063fbc34ad78ff948278b6399b0eae079c9c91
parent88daf5dee4aa09bbefe736ca6d379c89b0927272 (diff)
downloadrails-6e30114c0a2df3cd12b054675a2cb682c25d0783.tar.gz
rails-6e30114c0a2df3cd12b054675a2cb682c25d0783.tar.bz2
rails-6e30114c0a2df3cd12b054675a2cb682c25d0783.zip
update rubocop to 0.47
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock10
2 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index f529677fbb..e810e0357e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,7 +37,7 @@ gem "rb-inotify", github: "matthewd/rb-inotify", branch: "close-handling", requi
# Explicitly avoid 1.x that doesn't support Ruby 2.4+
gem "json", ">= 2.0.0"
-gem "rubocop", require: false
+gem "rubocop", ">= 0.47", require: false
group :doc do
gem "sdoc", "1.0.0.rc1"
diff --git a/Gemfile.lock b/Gemfile.lock
index 94d538b84b..5c8ae21fe7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -274,7 +274,7 @@ GEM
nokogiri (~> 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
- rainbow (2.1.0)
+ rainbow (2.2.1)
rake (12.0.0)
rb-fsevent (0.9.8)
rdoc (5.0.0)
@@ -287,8 +287,8 @@ GEM
redis (~> 3.3)
resque (~> 1.26)
rufus-scheduler (~> 3.2)
- rubocop (0.46.0)
- parser (>= 2.3.1.1, < 3.0)
+ rubocop (0.47.0)
+ parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
@@ -358,7 +358,7 @@ GEM
tzinfo (>= 1.0.0)
uglifier (3.0.4)
execjs (>= 0.3.0, < 3)
- unicode-display_width (1.1.2)
+ unicode-display_width (1.1.3)
useragent (0.16.8)
vegas (0.1.11)
rack (>= 1.0.0)
@@ -417,7 +417,7 @@ DEPENDENCIES
redis
resque!
resque-scheduler
- rubocop
+ rubocop (>= 0.47)
sass-rails
sdoc (= 1.0.0.rc1)
sequel