This repository was archived by the owner on Apr 14, 2021. It is now read-only.
[2.0] Allow conflicts between bundler dependencies and the current bundler version#5788
Merged
bundlerbot merged 2 commits intomasterfrom Jun 23, 2017
Merged
Conversation
segiddins
changed the title
segiddins
force-pushed
the
seg-allow-bundler-dep-conflicts
branch
from
ddc7207 to
c35495c
Compare
Contributor
Author
|
@indirect r? |
|
@bundlerbot r+ |
Collaborator
|
📌 Commit c35495c has been approved by |
Collaborator
bundlerbot
added a commit
that referenced
this pull request
Jun 23, 2017
…rect [2.0] Allow conflicts between bundler dependencies and the current bundler version ### What was the end-user problem that led to this PR? The problem will occur once 2.0 is released -- there are many gems that declare a `s.dependency "bundler", "~> 1.x"` dependency on bundler. This would essentially make them inoperable with Bundler 2. We want to make adopting 2.0 as pain-free as possible, so hard conflicts are a no-go. ### Was was your diagnosis of the problem? My diagnosis was that we need a way to allow conflicts on the bundler dependency once 2.0 comes out, so people can use 2.0. ### What is your fix for the problem, implemented in this PR? My fix introduces a feature flag for allowing these conflicts (enabled on 2.0), which when enabled will ignore bundler dependencies during resolution, and warn in the installer when a conflict would've occurred. ### Why did you choose this fix out of the possible options? I chose this fix because it has the minimal performance penalty with the feature flag enabled. This is mostly a port of #3871 to master.
Collaborator
|
☀️ Test successful - status-travis |
This was referenced Jun 23, 2017
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
What was the end-user problem that led to this PR?
The problem will occur once 2.0 is released -- there are many gems that declare a
s.dependency "bundler", "~> 1.x"dependency on bundler. This would essentially make them inoperable with Bundler 2. We want to make adopting 2.0 as pain-free as possible, so hard conflicts are a no-go.Was was your diagnosis of the problem?
My diagnosis was that we need a way to allow conflicts on the bundler dependency once 2.0 comes out, so people can use 2.0.
What is your fix for the problem, implemented in this PR?
My fix introduces a feature flag for allowing these conflicts (enabled on 2.0), which when enabled will ignore bundler dependencies during resolution, and warn in the installer when a conflict would've occurred.
Why did you choose this fix out of the possible options?
I chose this fix because it has the minimal performance penalty with the feature flag enabled. This is mostly a port of #3871 to master.