aboutsummaryrefslogtreecommitdiffstats
path: root/test/rubygems/test_gem_resolver_conflict.rb
Commit message (Expand)AuthorAgeFilesLines
* Merge prepare version of RubyGems 3.2.0Hiroshi SHIBATA2020-12-081-1/+1
* Revert "Manually merged from https://github.com/rubygems/rubygems/pull/2636"Hiroshi SHIBATA2020-09-231-2/+0
* Manually merged from https://github.com/rubygems/rubygems/pull/2636Hiroshi SHIBATA2020-09-231-0/+2
* Enforce no empty lines around class body in rubygemsDavid Rodríguez2020-07-311-2/+0
* [rubygems/rubygems] Remove conflict.rb code that was supposed to be removed i...bronzdoc2019-07-311-4/+0
* Merge master branch from rubygems/rubygems upstream.hsbt2018-11-211-1/+0
* Merge rubygems master.hsbt2017-10-081-1/+1
* * lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.5.2.hsbt2016-02-011-1/+1
* Add frozen_string_literal: false for all filesnaruse2015-12-161-0/+1
* * lib/rubygems: Update to RubyGems 2.4.1 master(713ab65)hsbt2014-09-141-10/+22
* * lib/rubygems: Update to RubyGems master 50a8210. Important changesdrbrain2013-11-211-7/+23
* * lib/rubygems: Update to RubyGems master 6a3d9f9. Changes include:drbrain2013-11-191-0/+59