Merge pull request #5768 from DirtyF/rubocop-47

Merge pull request 5768
2017-01-16 16:00:06 -05:00 · 2017-01-16 16:00:06 -05:00 · 750fb32ca3
parent 036dd3ccc9 d790477d6d
commit 750fb32ca3
2 changed files with 9 additions and 1 deletions
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -48,6 +48,14 @@ Metrics/ParameterLists:
  Max: 4
 Metrics/PerceivedComplexity:
  Max: 8
+Security/MarshalLoad:
+  Exclude:
+    - !ruby/regexp /test\/.*.rb$/
+    - lib/jekyll/regenerator.rb
+Security/YAMLLoad:
+  Exclude:
+    - !ruby/regexp /features\/.*.rb/
+    - !ruby/regexp /test\/.*.rb$/
 Style/Alias:
  Enabled: false
 Style/AlignArray:
--- a/2
+++ b/2
@ -25,7 +25,7 @@ group :test do
  gem "nokogiri"
  gem "rspec"
  gem "rspec-mocks"
-  gem "rubocop", "~> 0.46"
+  gem "rubocop", "~> 0.47"
  gem "test-theme", :path => File.expand_path("./test/fixtures/test-theme", File.dirname(__FILE__))

  gem "jruby-openssl" if RUBY_ENGINE == "jruby"