Update rubocop to .49 to fix CVE-2017-8418 #174
Conversation
|
@matthewalbani awesome, thank you! do you think you could add your squareup email to your github account, so these commits are attributed to you correctly? |
|
should be added now. Let me know if you want any of the changes undone and added to the skip list |
|
@bundlerbot r+ |
|
📌 Commit 5566b90 has been approved by |
Update rubocop to .49 to fix CVE-2017-8418 update rubocop to fix vuln CVE-2017-8418 rubocop/rubocop#4336
|
looks like this one broke some tests |
|
💔 Test failed - status-travis |
matthewalbani
force-pushed
the
update-rubocop
branch
11 times, most recently
from
2526786 to
254a561
Compare
| @@ -19,9 +19,9 @@ | |||
| TrueClass :prerelease, :null => false | |||
| DateTime :created_at, :null => false | |||
| DateTime :updated_at, :null => false | |||
| index [:rubygem_id, :number, :platform], :unique => true | |||
| index %i[rubygem_id number platform], :unique => true | |||
There was a problem hiding this comment.
Introducing this syntax places our compatibility clearly in Ruby 2.
Another PR should update the gemspec with a required_ruby_version = '> 2.0' marker.
There was a problem hiding this comment.
did not think about that is there a desire to avoid requiring 2+ still?
spec/concurrency_spec.rb
Outdated
| @@ -13,7 +13,7 @@ def write_thread(resource_id, content = "unchanging", &block) | |||
| resource = storage.resource(resource_id.to_s) | |||
|
|
|||
| if block | |||
| block.call(resource) | |||
| yield(resource) | |||
There was a problem hiding this comment.
You could try replacing if block with if block_given? (and remove the argument , &block)
spec/concurrency_spec.rb
Outdated
| @@ -31,7 +31,7 @@ def read_thread(resource_id, &block) | |||
|
|
|||
| if resource.exist?(:file) | |||
| if block | |||
| block.call(resource) | |||
| yield(resource) | |||
There was a problem hiding this comment.
One more block_given? opportunity.
| 50.times do | ||
| # so travis doesnt timeout from no output | ||
| print "." if ((count += 1) % 5).zero? |
There was a problem hiding this comment.
This is so great. Thank you!
matthewalbani
force-pushed
the
update-rubocop
branch
from
a9e4de0 to
d6cd183
Compare
|
@bundlerbot r+ |
|
📌 Commit d6cd183 has been approved by |
Update rubocop to .49 to fix CVE-2017-8418 update rubocop to fix vuln CVE-2017-8418 rubocop/rubocop#4336
|
💔 Test failed - status-travis |
|
☔ The latest upstream changes (presumably #178) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@matthewalbani i think this just needs a rebase to land :) |
autofix Style/PercentLiteralDelimiters add MarshalLoad, BlockLenth, LineLength to disabled list set variable number to snake_case add DuplicateGem and GlovalVar exeptions for spec tests autofix the rest that rubocop would do Manually fix the remaning issues
…t seems to make things worse add a bit of output to "with large data" test so travis does not timeout allow jruby to wait longer before timing out
matthewalbani
force-pushed
the
update-rubocop
branch
from
d6cd183 to
6d9e712
Compare
|
@bronzdoc am i meant to do anything else after the rebase? the tests passed now, but the bot didnt do anything. |
|
Thanks @matthewalbani! |
|
📌 Commit 6d9e712 has been approved by |
Update rubocop to .49 to fix CVE-2017-8418 update rubocop to fix vuln CVE-2017-8418 rubocop/rubocop#4336
|
☀️ Test successful - status-travis |
update rubocop to fix vuln CVE-2017-8418
rubocop/rubocop#4336