Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make inherit_from override inherit_gem #2418

Merged
merged 1 commit into from
Nov 11, 2015

Conversation

jonas054
Copy link
Collaborator

The problem was discovered in #2411, but this change does not fix the problem reported there.

Make configuration loading work as described in the README regarding precedence of .rubocop.yml, inherit_from, and inherit_gem.

Remove rubocop: config/default.yml from the example in the README as it makes no sense. All configurations are based on the default.yml of the rubocop being run.

Cc: @jhansche

The problem was discovered in rubocop#2411, but this change does not
fix the problem reported there.

Make configuration loading work as described in the README regarding
precedence of `.rubocop.yml`, `inherit_from`, and `inherit_gem`.

Remove `rubocop: config/default.yml` from the example in the
README as it makes no sense. All configurations are based on the
`default.yml` of the `rubocop` being run.
bbatsov added a commit that referenced this pull request Nov 11, 2015
Make inherit_from override inherit_gem
@bbatsov bbatsov merged commit eb24dcd into rubocop:master Nov 11, 2015
@bbatsov
Copy link
Collaborator

bbatsov commented Nov 11, 2015

👍

@jonas054 jonas054 deleted the 2411_fix_inherit_gem branch November 12, 2015 17:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants