aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2018-02-22 19:21:27 -0500
committerGitHub <noreply@github.com>2018-02-22 19:21:27 -0500
commit226211acfccec873409a75b1d979a3687477756a (patch)
treea6205fe9c6c107caff85573d935d29e51f0c3661
parent9d7fec6eed9279e710492bff0724a654ecd7baf2 (diff)
parent298ecee4794aa3f931a9a242e1035c8d67c0bf76 (diff)
downloadrails-226211acfccec873409a75b1d979a3687477756a.tar.gz
rails-226211acfccec873409a75b1d979a3687477756a.tar.bz2
rails-226211acfccec873409a75b1d979a3687477756a.zip
Merge pull request #32091 from utilum/update_rubocop
Update rubocop to the latest version
-rw-r--r--Gemfile.lock19
1 files changed, 9 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 87c991253b..baac1cee7e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -107,7 +107,7 @@ GEM
archive-zip (0.7.0)
io-like (~> 0.3.0)
arel (9.0.0)
- ast (2.3.0)
+ ast (2.4.0)
aws-partitions (1.20.0)
aws-sdk-core (3.3.0)
aws-partitions (~> 1.0)
@@ -335,9 +335,9 @@ GEM
nokogiri (1.8.1-x86-mingw32)
mini_portile2 (~> 2.3.0)
os (0.9.6)
- parallel (1.12.0)
- parser (2.4.0.0)
- ast (~> 2.2)
+ parallel (1.12.1)
+ parser (2.5.0.2)
+ ast (~> 2.4.0)
path_expander (1.0.2)
pg (1.0.0)
pg (1.0.0-x64-mingw32)
@@ -364,9 +364,8 @@ GEM
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
- rainbow (2.2.2)
- rake
- rake (12.2.1)
+ rainbow (3.0.0)
+ rake (12.3.0)
rb-fsevent (0.10.2)
rdoc (6.0.1)
redcarpet (3.2.3)
@@ -389,11 +388,11 @@ GEM
resque (~> 1.26)
rufus-scheduler (~> 3.2)
retriable (3.1.1)
- rubocop (0.51.0)
+ rubocop (0.52.1)
parallel (~> 1.10)
- parser (>= 2.3.3.1, < 3.0)
+ parser (>= 2.4.0.2, < 3.0)
powerpack (~> 0.1)
- rainbow (>= 2.2.2, < 3.0)
+ rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-progressbar (1.9.0)