This repository was archived by the owner on Nov 30, 2024. It is now read-only.
Rebased bennacer860 rubocop upgrade #2081
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This doesn't resolve the discussion in the previous PR, where the consensus was we'd revert the whitespace changes and disable the rule instead. |
soulcutter
force-pushed
the
rebased-bennacer860-rubocop
branch
from
1b5592e to
7ab0128
Compare
|
And 37c6435 needs unpicking to remove the spacing changes too |
…int/NonLocalExitFromIterator
This also updates the travis setup to use the latest bundler. Travis currently defaults to Bundler version 1.7.4, however, this bundler version does not support the `platform: :ruby_22` configuration setting. So we need to tell travis to install a more recent bundler. Also, `platform: :ruby_19` applies to **both** 1.9.2 and 1.9.3. But Rubocop stopped supporting 1.9.2. Thus we need to check the `RUBY_VERSION` in our `Gemfile` and not attempt to install Rubocop specifically for 1.9.2. Unfortunately, this bundler does not work with JRuby (2.0 mode), but does work with JRuby 1.8 mode. So we need to update the config to ignore JRuby 2.0. However, the current config incorrectly assumes we can do that by checking the `JRUBY_OPTS` environment variable. Travis actually sets this be default on _all_ systems: http://docs.travis-ci.com/user/environment-variables/#Default-Environment-Variables However, we can check the Ruby version we pass into the travis matrix by using the `TRAVIS_RUBY_VERSION` and seeing if it equals "jruby".
soulcutter
force-pushed
the
rebased-bennacer860-rubocop
branch
from
7ab0128 to
0eab115
Compare
|
@JonRowe That commit was tricky to pick out. Let me know if what I came up with meets your expectation. |
JonRowe
added a commit
that referenced
this pull request
Oct 12, 2015
Rebased bennacer860 rubocop upgrade
|
LGTM |
Closed
MatheusRich
pushed a commit
to MatheusRich/rspec-core
that referenced
this pull request
Oct 30, 2020
Rebased bennacer860 rubocop upgrade
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This branch does the cleanup I suggested in #2051