Skip to content
This repository was archived by the owner on Apr 14, 2021. It is now read-only.

[2.0] Add a feature flag to prefer gems.rb to Gemfile#5719

Merged
bundlerbot merged 1 commit intomasterfrom
seg-prefer-gems-rb
Jun 16, 2017
Merged

[2.0] Add a feature flag to prefer gems.rb to Gemfile#5719
bundlerbot merged 1 commit intomasterfrom
seg-prefer-gems-rb

Conversation

@segiddins
Copy link
Copy Markdown
Contributor

With prefer_gems_rb set (by default on 2.0), Bundler will prefer a gems.rb that is in the same directory as a Gemfile

@bundlerbot
Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #5701) made this pull request unmergeable. Please resolve the merge conflicts.

@segiddins segiddins force-pushed the seg-prefer-gems-rb branch from 019bf2f to 2eec079 Compare June 14, 2017 15:52
@segiddins segiddins changed the title Add a feature flag to prefer gems.rb to Gemfile [2.0] Add a feature flag to prefer gems.rb to Gemfile Jun 15, 2017
@indirect
Copy link
Copy Markdown

I am r+, but this needs a rebase.

@segiddins
Copy link
Copy Markdown
Contributor Author

No it doesn't? It merges cleanly

@indirect
Copy link
Copy Markdown

oh noooo I was tricked by bundlerbot. @bundlerbot r+

@bundlerbot
Copy link
Copy Markdown
Collaborator

📌 Commit 2eec079 has been approved by indirect

@bundlerbot
Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #5722) made this pull request unmergeable. Please resolve the merge conflicts.

With `prefer_gems_rb` set (by default on 2.0), Bundler will prefer a `gems.rb` that is in the same directory as a `Gemfile`
@segiddins segiddins force-pushed the seg-prefer-gems-rb branch from 2eec079 to 5f6a5b3 Compare June 15, 2017 21:13
@segiddins
Copy link
Copy Markdown
Contributor Author

Rebased. @bundlerbot r=indirect

@bundlerbot
Copy link
Copy Markdown
Collaborator

📌 Commit 5f6a5b3 has been approved by indirect

@bundlerbot
Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5f6a5b3 with merge d4a0672...

bundlerbot added a commit that referenced this pull request Jun 16, 2017
[2.0] Add a feature flag to prefer gems.rb to Gemfile

With `prefer_gems_rb` set (by default on 2.0), Bundler will prefer a `gems.rb` that is in the same directory as a `Gemfile`
@bundlerbot
Copy link
Copy Markdown
Collaborator

☀️ Test successful - status-travis
Approved by: indirect
Pushing d4a0672 to master...

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants