summaryrefslogtreecommitdiff
path: root/lib/bundler/resolver.rb
Commit message (Expand)AuthorAgeFilesLines
* Bump rubocop to 0.68.0rubocop_0_68David Rodríguez2019-04-301-1/+1
* Prefer `require_relative` for internal requiresDavid Rodríguez2019-04-191-2/+2
* Merge multisource related settingsDavid Rodríguez2019-04-081-1/+1
* Auto-correct `Style/RescueStandardError` offensesDavid Rodríguez2019-03-041-2/+2
* Fully enable some dependent Layout copsDavid Rodríguez2019-03-041-10/+10
* Fix multiple source warning messages from `error` to `warn`Jeremy Weathers2018-11-161-1/+1
* [GemVersionPromoter] Prefer non-pre-release versionssegiddins/6684-gvp-prefer-non-presSamuel Giddins2018-09-121-5/+6
* Don't mutate original error trees when determining version_conflict_messageGrey Baker2018-08-151-1/+1
* Fix error sortingSamuel Giddins2018-08-061-2/+2
* Make version conflict messages betterSamuel Giddins2018-08-061-8/+32
* Remove pre-release logic from requirement_satisfied_by?akihiro172018-06-191-4/+0
* Resolver: treat dependencies with prerelease versions as slightly constrainedGrey Baker2017-11-271-1/+2
* Bail out of reducing depency trees on huge dependency conflict setsJan Krutisch2017-11-021-0/+2
* Prioritise explicitly requested gems in dependency resolution sort orderGrey Baker2017-10-271-2/+4
* improve rubocop_todo.ymlKeiji Yoshimi2017-09-241-1/+1
* [Resolver] cache whether lockfile_uses_separate_rubygems_sourcesSamuel Giddins2017-09-131-8/+7
* Auto merge of #6014 - greysteil:failing-pre-release-spec, r=segiddinsThe Bundler Bot2017-09-101-0/+11
|\
| * Check all dependency requirements when determining if user wants pre-releaseGrey Baker2017-09-101-3/+4
| * Avoid pre-releases for sub-dependencies tooGrey Baker2017-09-101-1/+1
| * Consider prerelease versions last if in Gemfile as non-prereleaseGrey Baker2017-09-091-0/+10
* | Auto merge of #5985 - bundler:seg-multisource-error, r=indirectThe Bundler Bot2017-09-101-2/+29
|\ \ | |/ |/|
| * [Resolver] Error when it is ambigous which transitive source a gem should com...seg-multisource-errorSamuel Giddins2017-08-301-2/+29
* | [Resolver] Use the GVP for major updates in 2.0Samuel Giddins2017-09-051-1/+2
|/
* Update prerelease logic for new molinilloSamuel Giddins2017-08-011-0/+4
* [Resolver] Use Molinillo’s built in conflict message with treesSamuel Giddins2017-08-011-91/+68
* Refactor SpecGroup to not subclass ArraySamuel Giddins2017-08-011-102/+1
* Untangle the system gem path and the default bundle path in the specsSamuel Giddins2017-07-241-1/+1
* Default the install path to ./bundle in Bundler 2Samuel Giddins2017-07-231-1/+1
* [RuboCop] Enable Layout/EmptyLineAfterMagicComment copKoichi ITO2017-07-161-0/+1
* Update specs for the specific platform being added to the lockfileSamuel Giddins2017-07-051-1/+17
* More bundler 2 spec fixesseg-remove-rubygems-aggregateSamuel Giddins2017-06-271-6/+7
* Implement source pinning for 2.0Samuel Giddins2017-06-231-16/+63
* Make pretty-printing a dependency consistentseg-allow-bundler-dep-conflictsSamuel Giddins2017-06-221-5/+1
* Allow conflicts between bundler dependencies and the current bundler versionSamuel Giddins2017-06-221-1/+7
* Use reject! and map.flatten(1) for Ruby 1.8.7 supportseg-conflict-minimal-dependenciesSamuel Giddins2017-03-301-4/+4
* [Resolver] Handle when there is no inherently conflicting set of depsSamuel Giddins2017-03-301-1/+1
* [Resolver] Only include minimal set of conflicting deps in conflict messageSamuel Giddins2017-03-301-1/+10
* [Resolver] Improve sorting of deps with 0 or 1 possibilityseg-resolver-sortingSamuel Giddins2017-02-171-1/+8
* [Resolver] Improve resolver debug outputSamuel Giddins2017-02-171-3/+3
* [Resolver] Restrict activated platforms to those in the Gemfileseg-resolver-restrict-platformsSamuel Giddins2017-01-231-4/+7
* [Resolver] Consider locked dependencies firstSamuel Giddins2017-01-141-2/+3
* Remove debug codeDiego Steiner2016-09-271-1/+0
* Fixes broken testDiego Steiner2016-09-271-1/+6
* Merge remote-tracking branch 'origin/master' into 4854-gemnotfound-errorDiego Steiner2016-09-271-48/+54
|\
| * Refactor best-platform matchingSamuel Giddins2016-08-251-2/+1
| * [Resolver] Remove required_by attribute from SpecGroupSamuel Giddins2016-08-251-2/+1
| * Resolve for specific platformsSamuel Giddins2016-08-251-23/+12
| * [Resolver] Remove ruby_version attributeSamuel Giddins2016-08-231-14/+17
| * Use the resolver to resolve for ruby / rubygems versionsSamuel Giddins2016-08-231-11/+22
| * Always use DepProxy in the resolverseg-lock-platformSamuel Giddins2016-08-221-1/+1
View Lorry Controller Status