This repository has been archived by the owner on Nov 30, 2024. It is now read-only.
Deprecation formatter 2 99 cherrypicks #1125
Merged
Conversation
This file contains 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
Conflicts: spec/rspec/core/formatters/deprecation_formatter_spec.rb
Conflicts: lib/rspec/core/formatters/deprecation_formatter.rb
|
Do we know why they have conflicts? I thought it was a new feature in 2.99/3.0 so it seems like they could (and perhaps should) be the same... |
myronmarston
added a commit
that referenced
this pull request
Oct 24, 2013
…picks Deprecation formatter 2 99 cherrypicks
|
Thanks @soulcutter! |
yujinakayama
pushed a commit
to yujinakayama/rspec-monorepo
that referenced
this pull request
Oct 6, 2021
…n-formatter-2-99-cherrypicks Deprecation formatter 2 99 cherrypicks --- This commit was imported from rspec/rspec-core@bca50bd.
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.
These
DeprecationFormattercherry picks always seem to have conflicts, so letting Travis do its magic to make sure I merged them right.