summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-05-23 14:03:04 -0400
committerRobert Speicher <rspeicher@gmail.com>2016-05-23 14:03:04 -0400
commit6898087b97234516b1d31ac731653bebbd9a171e (patch)
tree99bdbc2b2c921cef7bab6cf5436df470d28d3067 /Gemfile.lock
parent68b8e86a813608ae378b39ba5a64ff07fb9a057a (diff)
downloadgitlab-ce-6898087b97234516b1d31ac731653bebbd9a171e.tar.gz
Update rubocop to 0.40.0
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock14
1 files changed, 7 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index e1c5b9630d3..52aee37d737 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -551,7 +551,7 @@ GEM
orm_adapter (0.5.0)
paranoia (2.1.4)
activerecord (~> 4.0)
- parser (2.3.0.6)
+ parser (2.3.1.0)
ast (~> 2.2)
pg (0.18.4)
poltergeist (1.9.0)
@@ -686,15 +686,15 @@ GEM
rspec-retry (0.4.5)
rspec-core
rspec-support (3.4.1)
- rubocop (0.38.0)
- parser (>= 2.3.0.6, < 3.0)
+ rubocop (0.40.0)
+ parser (>= 2.3.1.0, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1)
ruby-fogbugz (0.2.1)
crack (~> 0.4)
- ruby-progressbar (1.7.5)
+ ruby-progressbar (1.8.1)
ruby-saml (1.1.2)
nokogiri (>= 1.5.10)
uuid (~> 2.3)
@@ -841,7 +841,7 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.2)
- unicode-display_width (1.0.2)
+ unicode-display_width (1.0.5)
unicorn (4.9.0)
kgio (~> 2.6)
rack
@@ -1015,7 +1015,7 @@ DEPENDENCIES
rqrcode-rails3 (~> 0.1.7)
rspec-rails (~> 3.4.0)
rspec-retry
- rubocop (~> 0.38.0)
+ rubocop (~> 0.40.0)
ruby-fogbugz (~> 0.2.1)
sanitize (~> 2.0)
sass-rails (~> 5.0.0)
@@ -1060,4 +1060,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
- 1.12.3
+ 1.12.4