aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-10-13 13:06:09 +0900
committerGitHub <noreply@github.com>2017-10-13 13:06:09 +0900
commit4e6774eed5a95dda463df0a9f0b264b16e61e79e (patch)
treef12c2b9e929711cc1ac5bf2e1694537a0833166a
parenta254454debf42dd4ab052c90e6434d75f9a5a7c8 (diff)
parent2e0de2dd41234a59b028af3ed486549bda6ea438 (diff)
downloadrails-4e6774eed5a95dda463df0a9f0b264b16e61e79e.tar.gz
rails-4e6774eed5a95dda463df0a9f0b264b16e61e79e.tar.bz2
rails-4e6774eed5a95dda463df0a9f0b264b16e61e79e.zip
Merge pull request #30874 from koic/bump_rubocop_to_0_50_0
Bump RuboCop 0.50.0
-rw-r--r--.codeclimate.yml2
-rw-r--r--Gemfile.lock6
2 files changed, 4 insertions, 4 deletions
diff --git a/.codeclimate.yml b/.codeclimate.yml
index 63d3562e9b..1f4a1bb201 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -1,7 +1,7 @@
engines:
rubocop:
enabled: true
- channel: rubocop-0-49
+ channel: rubocop-0-50
ratings:
paths:
diff --git a/Gemfile.lock b/Gemfile.lock
index 9c3a7e3c82..6228d754a8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -391,14 +391,14 @@ GEM
sinatra (>= 0.9.2)
vegas (~> 0.1.2)
retriable (3.1.1)
- rubocop (0.49.1)
+ rubocop (0.50.0)
parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1)
- rainbow (>= 1.99.1, < 3.0)
+ rainbow (>= 2.2.2, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
- ruby-progressbar (1.8.1)
+ ruby-progressbar (1.9.0)
ruby_dep (1.5.0)
rubyzip (1.2.1)
rufus-scheduler (3.4.2)