ruby.git/lib/rubygems/resolver/conflict.rb, branch v3_2_11 The Ruby Programming Language Merge RubyGems-3.4.18 and Bundler-2.4.18 2023-08-29T14:25:18+00:00 Hiroshi SHIBATA hsbt@ruby-lang.org 2023-08-18T03:10:30+00:00 1434059ab5006e32ad872a62e7f0ecca190194fb 






Merge rubygems/bundler HEAD.
2022-08-09T03:05:19+00:00

Hiroshi SHIBATA
hsbt@ruby-lang.org

2022-08-09T02:16:07+00:00

44264b4fee1e208e759710c39271186ff9856b40

  Pick from https://github.com/rubygems/rubygems/commit/dfbb5a38114640e0d8d616861607f3de73ee0199





  Pick from https://github.com/rubygems/rubygems/commit/dfbb5a38114640e0d8d616861607f3de73ee0199







RubyGems: Enable Style/StringLiterals cop
2022-07-22T03:07:23+00:00

Takuya Noguchi
takninnovationresearch@gmail.com

2022-07-17T08:08:51+00:00

d7ffd3fea402239b16833cc434404a7af82d44f3

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>





Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>







Merge prepare version of RubyGems 3.2.0
2020-12-08T08:30:02+00:00

Hiroshi SHIBATA
hsbt@ruby-lang.org

2020-12-08T07:33:39+00:00

4aca77edde91f826aa243e268bf1ef5214530583












Revert "Manually merged from https://github.com/rubygems/rubygems/pull/2636"
2020-09-23T13:01:44+00:00

Hiroshi SHIBATA
hsbt@ruby-lang.org

2020-09-23T12:59:35+00:00

b717f73402dc6f2d6ba6a1d72d9c8543a4f2cd27

  31a6eaabc165d8a222e176f2c809d90622d88ec2 is obsoleted with
  https://github.com/rubygems/rubygems/pull/3820





  31a6eaabc165d8a222e176f2c809d90622d88ec2 is obsoleted with
  https://github.com/rubygems/rubygems/pull/3820







Manually merged from https://github.com/rubygems/rubygems/pull/2636
2020-09-23T12:02:56+00:00

Hiroshi SHIBATA
hsbt@ruby-lang.org

2020-09-23T12:02:56+00:00

31a6eaabc165d8a222e176f2c809d90622d88ec2

  Enable Style/EmptyLinesAroundClassBody rubocop cop.





  Enable Style/EmptyLinesAroundClassBody rubocop cop.







Enforce no empty lines around class body in rubygems
2020-07-31T12:07:19+00:00

David Rodríguez
deivid.rodriguez@riseup.net

2020-07-13T10:01:07+00:00

a89665b7b1abb5bb6005fd638dc920848cc50f72

To normalize the code style with `bundler`.





To normalize the code style with `bundler`.







Use space inside block braces everywhere
2020-06-15T12:20:37+00:00

David Rodríguez
deivid.rodriguez@riseup.net

2020-06-10T17:46:05+00:00

955f1837a180d8936f90ab6cf039ccb8f751be72

To make rubygems code style consistent with bundler.





To make rubygems code style consistent with bundler.







[rubygems/rubygems] Remove conflict.rb code that was supposed to be removed in Rubygems 3
2019-07-30T23:47:01+00:00

bronzdoc
lsagastume1990@gmail.com

2019-06-22T22:58:55+00:00

5eacb4c52ed52185d78aa1437c0a69ed986a95f6

https://github.com/rubygems/rubygems/commit/6d5f743a89





https://github.com/rubygems/rubygems/commit/6d5f743a89







Merge master branch from rubygems/rubygems upstream.
2018-11-21T10:20:47+00:00

hsbt
hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2018-11-21T10:20:47+00:00

5335ce0e060c7a2a0b01c57f8f8a64254f2658e1

  * Enable Style/MethodDefParentheses in Rubocop
    https://github.com/rubygems/rubygems/pull/2478
  * Enable Style/MultilineIfThen in Rubocop
    https://github.com/rubygems/rubygems/pull/2479
  * Fix required_ruby_version with prereleases and improve error message
    https://github.com/rubygems/rubygems/pull/2344
  * Fix bundler rubygems binstub not properly looking for bundler
    https://github.com/rubygems/rubygems/pull/2426

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e





  * Enable Style/MethodDefParentheses in Rubocop
    https://github.com/rubygems/rubygems/pull/2478
  * Enable Style/MultilineIfThen in Rubocop
    https://github.com/rubygems/rubygems/pull/2479
  * Fix required_ruby_version with prereleases and improve error message
    https://github.com/rubygems/rubygems/pull/2344
  * Fix bundler rubygems binstub not properly looking for bundler
    https://github.com/rubygems/rubygems/pull/2426

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e