summaryrefslogtreecommitdiff
path: root/lib/bundler/resolver.rb
Commit message (Expand)AuthorAgeFilesLines
* [Resolver] Mark molinillo methods as publicseg-molinillo-0.5.0Samuel Giddins2016-06-191-2/+2
* Fixes #4593 and adds related specsBruno Ferreira2016-06-081-1/+1
* Auto merge of #4580 - bundler:seg-resolver-performance, r=indirectHomu2016-06-071-25/+23
|\
| * [RuboCop] Fix SpacingSamuel Giddins2016-06-041-1/+1
| * [Resolver] Deal with Gem::Version hash and == not aligningSamuel Giddins2016-06-041-2/+7
| * [RuboCop] Fix violationsSamuel Giddins2016-06-021-5/+1
| * [Resolver] Drop unused empty array allocationsSamuel Giddins2016-06-021-4/+2
| * fixup! [Resolver] Improve calculating amount_constrainedSamuel Giddins2016-06-021-2/+2
| * [RuboCop] Fix style issuesSamuel Giddins2016-06-021-1/+1
| * [Resolver] Speed up searchingSamuel Giddins2016-06-021-9/+6
| * [Resolver] Improve calculating amount_constrainedSamuel Giddins2016-06-021-7/+9
* | gemspec allow conflictsSamuel Giddins2016-06-041-1/+1
|/
* Add integration spec for multiple versions and diff platform in gemspecJames Wen2016-02-221-1/+1
* Add platform info to error message for different platform in gemspec than Gem...James Wen2016-02-221-4/+15
* Compatibility with frozen string literalsSamuel Giddins2016-01-311-2/+3
* [RuboCop] Address Style/GuardClauseSamuel Giddins2016-01-311-10/+9
* [Resolver] Determine debug mode onceseg-debug-onceSamuel Giddins2016-01-301-1/+2
* Auto merge of #4143 - deepj:string-frozen-literal, r=indirectHomu2016-01-151-1/+1
|\
| * Better support of Ruby 2.3 with enabled frozen string literaldeepj2015-12-161-1/+1
* | Merge tag 'v1.11.2'Andre Arko2015-12-151-1/+1
|\ \
| * | check respond_to? before calling methodAndre Arko2015-12-151-1/+1
| |/
* | Merge pull request #4064 from pivotal-cf-experimental/masterAndre Arko2015-12-121-2/+2
|\ \ | |/ |/|
| * Changes for https://github.com/bundler/bundler/pull/4064#discussion-diff-4513...David Morhovich2015-11-181-1/+1
| * Adds ruby version to Gemfile.lock.David Morhovich2015-10-271-2/+2
* | [RuboCop] Enable Style/NextSamuel Giddins2015-11-261-34/+31
* | [RuboCop] Enable Style/AndOrSamuel Giddins2015-11-261-2/+2
* | [RuboCop] Enable Style/RescueModifierSamuel Giddins2015-11-261-2/+6
|/
* Auto merge of #4026 - bundler:seg-resolve-ruby-version, r=indirectHomu2015-10-181-7/+14
|\
| * [Resolver] Banish uninitialized ivar warningSamuel Giddins2015-10-021-1/+1
| * [Resolver] Resolve for a given ruby versionSamuel Giddins2015-10-011-7/+14
* | Fix Style/SpaceInsideStringInterpolationErick Sasse2015-10-031-1/+1
|/
* Improve hint on conflict error messageSean Linsley2015-09-051-1/+3
* Use locked_requirement platform to print it outfix-fix-3862Andre Arko2015-08-021-1/+9
* Auto merge of #3862 - bundler:seg-resolver-error-formatting, r=segiddinsHomu2015-08-021-28/+18
|\
| * wrap the locked requirement in a DepProxyseg-resolver-error-formattingAndre Arko2015-08-011-1/+1
| * [Resolver] Ordering and 1.8.7 arent friendsSamuel E. Giddins2015-07-311-1/+1
| * [Resolver] Sort version conflicts by nameSamuel E. Giddins2015-07-301-1/+1
| * [Resolver] Tune conflict message wordingSamuel E. Giddins2015-07-261-1/+1
| * [Resolver] Update for Molinillo API changesSamuel E. Giddins2015-07-261-4/+6
| * [Resolver] Explain what each failed bit in a conflict tree resolved toSamuel E. Giddins2015-07-261-0/+3
| * [Resolver] No need to grab the name off of the conflicting requirementSamuel E. Giddins2015-07-221-4/+4
| * [Resolver] Remove years-old commentSamuel E. Giddins2015-07-221-8/+0
| * Get rid of clean_req in favor of a nicer #to_s in DepProxySamuel E. Giddins2015-07-221-15/+5
| * [Resolver] Improve formatting of error messagesSamuel E. Giddins2015-07-211-3/+6
* | Fix Style/AccessModifierIndentationErick Sasse2015-07-211-1/+1
|/
* Fix Lint/UnusedBlockArgumentErick Sasse2015-07-201-1/+1
* Fix Style/SpaceInsideBlockBracesAndre Arko2015-07-181-9/+9
* [RuboCop] Enable Style/StringLiteralsSamuel E. Giddins2015-07-151-19/+19
* [RuboCop] Enable Style/SymbolProcSamuel E. Giddins2015-07-151-1/+1
* [RuboCop] Enable Style/EmptyLinesSamuel E. Giddins2015-07-151-3/+0
View Lorry Controller Status