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

[Fix #3913] Require first to fix resolution #3914

Merged

Conversation

backus
Copy link
Contributor

@backus backus commented Jan 16, 2017

Also fixes rubocop/rubocop-rspec#299


Before submitting the PR make sure the following are checked:

  • Wrote good commit messages.
  • Commit message starts with [Fix #issue-number] (if the related issue exists).
  • Used the same coding conventions as the rest of the project.
  • Feature branch is up-to-date with master (if not - rebase it).
  • Squashed related commits together.
  • Added tests.
  • Added an entry to the Changelog if the new code introduces user-observable changes. See changelog entry format.
  • All tests are passing.
  • The new code doesn't generate RuboCop offenses.
  • The PR relates to only one subject with a clear title
    and description in grammatically correct, complete sentences.
  • Updated cop documentation with rake generate_cops_documentation (required only when you've added a new cop or changed the configuration/documentation of an existing cop).

@backus backus force-pushed the fix/third-party-requires-resolves-namespace branch 3 times, most recently from 0df4e91 to 7761677 Compare January 16, 2017 12:01
@bquorning
Copy link
Contributor

👍 This resolves my issue, as reported in rubocop/rubocop-rspec#299.

@backus backus force-pushed the fix/third-party-requires-resolves-namespace branch from 7761677 to 79fdf8e Compare January 16, 2017 20:54
@bbatsov bbatsov merged commit 2e41926 into rubocop:master Jan 17, 2017
@backus backus deleted the fix/third-party-requires-resolves-namespace branch January 17, 2017 04:00
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.

Conflict between Rails/FilePath and RSpec/FilePath
3 participants