summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2017-06-20 10:03:20 -0700
committerGitHub <noreply@github.com>2017-06-20 10:03:20 -0700
commit413b52cbeee07f5c772e4b430b06afd29470447a (patch)
tree884391f50dd4dde11231653cda860ef5eea44e56 /Gemfile.lock
parent1b48be5de30aa9f5087d459d8bec20388c71a457 (diff)
parent0734ceaf3eb333fe221efdcca3c45a22e261d3b7 (diff)
downloadchef-413b52cbeee07f5c772e4b430b06afd29470447a.tar.gz
Merge pull request #6228 from chef/lcg/bump-rubocop
bump rubocop to 0.49.1
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock19
1 files changed, 10 insertions, 9 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 5e81afa4cf..d2a310c721 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: 69c1c0d07aa4613bcdc3454767c9fb0d5ee9b36b
+ revision: e6b966a18dc4a12b4dfa49ccb911dad7432ca4fd
branch: master
specs:
- chefstyle (0.5.0)
- rubocop (= 0.47.1)
+ chefstyle (0.6.0)
+ rubocop (= 0.49.1)
GIT
remote: https://github.com/chef/github-changelog-generator
@@ -144,13 +144,13 @@ GEM
debug_inspector (0.0.3)
diff-lcs (1.3)
docile (1.1.5)
- docker-api (1.33.4)
+ docker-api (1.33.5)
excon (>= 0.38.0)
json
erubis (2.7.0)
ethon (0.10.1)
ffi (>= 1.3.0)
- excon (0.56.0)
+ excon (0.57.0)
faraday (0.12.1)
multipart-post (>= 1.2, < 3)
faraday-http-cache (2.0.0)
@@ -181,7 +181,7 @@ GEM
httpclient (2.8.3)
i18n (0.8.4)
iniparse (1.4.3)
- inspec (1.27.0)
+ inspec (1.28.1)
addressable (~> 2.4)
faraday (>= 0.9.0)
hashie (~> 3.4)
@@ -308,7 +308,8 @@ GEM
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
- rubocop (0.47.1)
+ rubocop (0.49.1)
+ parallel (~> 1.10)
parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
@@ -348,7 +349,7 @@ GEM
toml (0.1.2)
parslet (~> 1.5.0)
tomlrb (1.2.4)
- train (0.24.0)
+ train (0.25.0)
docker-api (~> 1.26)
json (>= 1.8, < 3.0)
mixlib-shellout (~> 2.0)
@@ -369,7 +370,7 @@ GEM
ethon (>= 0.8.0)
tzinfo (1.2.3)
thread_safe (~> 0.1)
- unicode-display_width (1.2.1)
+ unicode-display_width (1.3.0)
uuidtools (2.1.5)
websocket (1.2.4)
win32-api (1.5.3-universal-mingw32)