summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix loadError occuring in https://github.com/bundler/bundler/issues/6537colby/fix-bundler-load-errorColby Swandale2018-09-132-1/+16
* Auto merge of #6675 - MaxLap:master, r=greysteilThe Bundler Bot2018-08-273-5/+75
|\
| * Let updater retry on HTTPRequestedRangeNotSatisfiable (416)Maxime Lapointe2018-08-273-0/+70
| * Clarify variable options => headersMaxime Lapointe2018-08-271-5/+5
|/
* Auto merge of #6673 - bundler:colby/new-team-member-homu, r=segiddinsThe Bundler Bot2018-08-271-0/+1
|\
| * Add adding a team member to bundlerbotcolby/new-team-member-homuColby Swandale2018-08-241-0/+1
* | Auto merge of #6669 - ChrisBr:fix_dep_proxy, r=segiddinsThe Bundler Bot2018-08-272-2/+24
|\ \
| * | Fix DepProxy#hash calculationChristian Bruckmayer2018-08-232-1/+6
| * | Fix DepProxy#== undefind method errorChristian Bruckmayer2018-08-232-1/+18
* | | Auto merge of #6670 - bundler:colby/invite-stephanie-morillo, r=segiddinsThe Bundler Bot2018-08-271-1/+1
|\ \ \ | |_|/ |/| |
| * | add Stephanie Morillo to gemspec author listcolby/invite-stephanie-morilloColby Swandale2018-08-231-1/+1
|/ /
* | Auto merge of #6664 - greysteil:avoid-printing-git-error, r=colby-swandaleThe Bundler Bot2018-08-221-1/+9
|\ \
| * | Avoid printing git error when checking version on badly packaged versionGrey Baker2018-08-161-1/+9
* | | fix rubocopColby Swandale2018-08-221-0/+1
* | | merge v1.16.4Colby Swandale2018-08-222-0/+22
|\ \ \ | |_|/ |/| |
| * | Version 1.16.4 with changelogv1.16.4Colby Swandale2018-08-202-1/+22
| * | Auto merge of #6668 - eregon:fix-encoding-spec-from-6661, r=deivid-rodriguezThe Bundler Bot2018-08-201-1/+1
| * | Add encoding magic comment to gemfile specColby Swandale2018-08-171-0/+1
| * | Auto merge of #6662 - bundler:indirect/update-authors, r=colby-swandaleThe Bundler Bot2018-08-161-1/+2
| * | Auto merge of #6650 - greysteil:dont-mutate-original-trees, r=segiddinsThe Bundler Bot2018-08-161-0/+3
| * | Auto merge of #6661 - eregon:consistent-encoding-for-reading-files, r=deivid-...The Bundler Bot2018-08-163-3/+32
| * | Auto merge of #6652 - bundler:seg-molinillo-0.6.6, r=segiddinsThe Bundler Bot2018-08-163-4/+19
| * | Auto merge of #6645 - bundler:colby/require-etc, r=colby-swandaleThe Bundler Bot2018-08-161-0/+1
| * | Auto merge of #6636 - ojab:1-16-stable, r=indirectThe Bundler Bot2018-08-161-6/+2
| * | Auto merge of #6624 - bundler:no-document, r=colby-swandaleThe Bundler Bot2018-08-163-3/+11
| * | Auto merge of #6621 - ralphbolo:patch-1, r=segiddinsThe Bundler Bot2018-08-161-1/+1
| * | Auto merge of #6613 - kemitchell:mention-show-sorts-in-doc, r=colby-swandaleThe Bundler Bot2018-08-161-2/+3
| * | Auto merge of #6570 - akihiro17:prerelease-dependency, r=segiddinsThe Bundler Bot2018-08-162-4/+7
| * | Auto merge of #6568 - greysteil:conservative-groups, r=segiddinsThe Bundler Bot2018-08-162-2/+19
* | | Auto merge of #6668 - eregon:fix-encoding-spec-from-6661, r=deivid-rodriguezThe Bundler Bot2018-08-201-1/+1
|\ \ \
| * | | Fix encoding spec from #6661 to also work 1.9.3Benoit Daloze2018-08-201-1/+1
|/ / /
* | | Auto merge of #6662 - bundler:indirect/update-authors, r=colby-swandaleThe Bundler Bot2018-08-151-2/+3
|\ \ \
| * | | Add new team members to gemspec authorsindirect/update-authorsAndre Arko2018-08-141-2/+3
* | | | Auto merge of #6657 - hibariya:sh_with_code, r=colby-swandaleThe Bundler Bot2018-08-151-5/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Just remove the method since it looks like not used anymoreHibariya2018-08-101-5/+0
| * | | Fix SystemStackError (stack level too deep) in GemHelper#sh_with_codeHibariya2018-08-081-1/+1
* | | | Auto merge of #6650 - greysteil:dont-mutate-original-trees, r=segiddinsThe Bundler Bot2018-08-151-1/+1
|\ \ \ \
| * | | | Don't mutate original error trees when determining version_conflict_messageGrey Baker2018-08-151-1/+1
|/ / / /
* | | | Auto merge of #6647 - bundler:segiddins/conflict-message-improvements, r=indi...The Bundler Bot2018-08-149-27/+101
|\ \ \ \
| * | | | Allow using RubyGems\0 as the name when RG is a pre-release versionSamuel Giddins2018-08-071-1/+3
| * | | | Fix error sortingSamuel Giddins2018-08-067-16/+16
| * | | | Make version conflict messages betterSamuel Giddins2018-08-062-11/+34
| * | | | Fix computation of version range emptinessSamuel Giddins2018-08-062-5/+54
* | | | | Auto merge of #6659 - bundler:indirect/playbooks, r=indirectThe Bundler Bot2018-08-142-1/+43
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | address feedback from @colbyAndre Arko2018-08-141-5/+6
| * | | | better formattingAndre Arko2018-08-101-8/+15
| * | | | hopefully fix the indentationAndre Arko2018-08-101-6/+6
| * | | | include github org changesAndre Arko2018-08-101-0/+3
| * | | | add TEAM_CHANGES to doc/playbooks/Andre Arko2018-08-101-0/+31
| * | | | move RELEASING to doc/playbooks/Andre Arko2018-08-101-1/+1