aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bundler/resolver.rb
Commit message (Expand)AuthorAgeFilesLines
* [rubygems/rubygems] Give better conflict resolution adviceDavid Rodríguez2022-05-311-1/+1
* [rubygems/rubygems] Fix crash when printing resolution conflicts on metadata ...David Rodríguez2022-05-241-7/+6
* Merge RubyGems and Bundler HEADHiroshi SHIBATA2022-05-201-1/+1
* Merge https://github.com/rubygems/rubygems/commit/3f7d0352e84b29d4a2d4cd93b31...Hiroshi SHIBATA2022-04-281-27/+60
* Sync latest Bundler & RubyGemsDavid Rodríguez2022-02-011-4/+5
* Merge rubygems/rubygems HEAD.Hiroshi SHIBATA2022-01-191-8/+2
* [rubygems/rubygems] Improve errors a bit moreDavid Rodríguez2021-12-171-1/+6
* [rubygems/rubygems] Share gem not found logic with transitive dependencies tooDavid Rodríguez2021-12-171-28/+30
* [rubygems/rubygems] Remove unnecessary line breakDavid Rodríguez2021-12-171-2/+1
* [rubygems/rubygems] Fix crash when no matching variants are found for the cur...David Rodríguez2021-12-171-1/+2
* [rubygems/rubygems] Improve error message if only platform doesn't matchDavid Rodríguez2021-12-171-2/+12
* [rubygems/rubygems] Improve resolver error messagesDavid Rodríguez2021-12-171-13/+1
* [rubygems/rubygems] Improve sources representationDavid Rodríguez2021-12-031-2/+2
* Merge rubygems master fd676ac464491afaa0baf5435cb11b3f86229cbdHiroshi SHIBATA2021-12-011-2/+0
* [rubygems/rubygems] Improve "gem not found in source" errorsDavid Rodríguez2021-08-311-2/+2
* [rubygems/rubygems] Only set local variable in the branch using itDavid Rodríguez2021-08-311-6/+5
* [rubygems/rubygems] Simplify error message building in resolverDavid Rodríguez2021-08-311-4/+2
* [rubygems/rubygems] Remove redundant part of error messageDavid Rodríguez2021-08-311-5/+1
* Sync latest bundler & rubygems development versionDavid Rodríguez2021-07-071-65/+13
* Sync bundler & rubygemsDavid Rodríguez2021-05-111-32/+3
* Sync latest development version of bundler & rubygemsDavid Rodríguez2021-03-081-79/+116
* Merge RubyGems 3.2.2 and Bundler 2.2.2Hiroshi SHIBATA2020-12-181-0/+2
* Prepare to release rubygems-3.2.1 and bundler-2.2.1Hiroshi SHIBATA2020-12-151-27/+22
* Merge prepare version of Bundler 2.2.0Hiroshi SHIBATA2020-12-081-3/+2
* Merge bundler-2.2.0.rc.2Hiroshi SHIBATA2020-10-151-4/+4
* Update the bundler version with master branchHiroshi SHIBATA2020-05-131-8/+31
* Merge bundler master from upstream.Hiroshi SHIBATA2019-06-091-3/+3
* Merge Bundler 2.1.0.pre.1 as developed version from upstream.hsbt2019-04-141-21/+69
* Added bundler as default gems. Revisit [Feature #12733]hsbt2018-11-021-0/+373
* Postponing the Bundler merge.hsbt2017-12-221-372/+0
* Merge release version of bundler-1.16.1 from upstream.hsbt2017-12-211-0/+2
* Merge 1-16-stable branch of bundler.hsbt2017-12-121-1/+2
* Update bundled bundler to 1.16.0.hsbt2017-11-011-193/+152
* Merge bundler to standard libraries.hsbt2017-09-081-0/+410