summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix stubbing RUBY_VERSION on 1.8.7seg-allow-unlocking-when-removing-rubySamuel Giddins2016-06-102-7/+4
* [Definition] Fail gracefully when the lockfile ruby version is invalidSamuel Giddins2016-06-081-1/+7
* [RubyVersion] Fix patternSamuel Giddins2016-06-082-3/+3
* Fix setup spec's written ruby version sectionSamuel Giddins2016-06-081-1/+1
* [RuboCop] Fix violations in RubyVersionSamuel Giddins2016-06-051-5/+3
* [Definition] Unlock ruby when locked version is incompatible with Gemfile ver...Samuel Giddins2016-06-052-0/+47
* [RubyVersion] Add .from_stringSamuel Giddins2016-06-052-0/+52
* [RubyVersion] Make #diff error more helpfulSamuel Giddins2016-06-051-1/+1
* Add spec hax support for stubbing the ruby versionSamuel Giddins2016-06-052-0/+14
* Update platform specs for implicit ruby version unlockingSamuel Giddins2016-06-051-2/+2
* [Definition] Allow unlocking when removing the ruby version requirementSamuel Giddins2016-06-052-0/+19
* Auto merge of #4640 - bundler:seg-bundle-lock-add-platform, r=indirectHomu2016-06-054-3/+21
|\
| * [Lock] Add --add-platformseg-bundle-lock-add-platformSamuel Giddins2016-06-044-3/+21
* | Auto merge of #4445 - bundler:seg-gemspec-allow-conflicts, r=indirectHomu2016-06-0511-21/+60
|\ \ | |/ |/|
| * [Docs] Document gempsec conflict behaviorseg-gemspec-allow-conflictsSamuel Giddins2016-06-041-0/+4
| * [Env] Fix printing gemspecsSamuel Giddins2016-06-041-2/+2
| * fix gemspec cachingSamuel Giddins2016-06-041-8/+1
| * add spec for allowing conflictsSamuel Giddins2016-06-042-1/+20
| * gemspec allow conflictsSamuel Giddins2016-06-047-11/+34
|/
* Auto merge of #4636 - RochesterinNYC:add-merge-conflicts-quality-spec, r=segi...Homu2016-06-031-3/+29
|\
| * Screen all files for leftover debugging mechanismsJames Wen (RochesterinNYC)2016-06-011-3/+1
| * Create quality check for unresolved merge conflictsJames Wen (RochesterinNYC)2016-05-311-0/+28
|/
* Auto merge of #4628 - bundler:seg-inline-install-when-needed, r=indirectHomu2016-06-013-4/+29
|\
| * [Inline] Install when necessaryseg-inline-install-when-neededSamuel Giddins2016-05-313-4/+29
|/
* Auto merge of #4626 - RochesterinNYC:update-feature-requests-reporting-mechan...Homu2016-05-312-8/+6
|\
| * Update DEVELOPMENT.md with new feature request/addition processJames Wen (RochesterinNYC)2016-05-291-4/+3
| * Add `@segiddins` and `@RochesterinNYC` as potential contacts for contribution...James Wen (RochesterinNYC)2016-05-281-3/+2
| * Update CONTRIBUTING.md with new feature request processJames Wen (RochesterinNYC)2016-05-271-1/+1
|/
* Auto merge of #4606 - allenzhao:handle-yanked, r=RochesterinNYCHomu2016-05-302-2/+60
|\
| * Fix specAllen Zhao2016-05-292-5/+5
| * Handle yanked gemsAllen Zhao2016-05-242-2/+60
* | Auto merge of #4610 - b-ggs:binstub-standalone, r=RochesterinNYCHomu2016-05-293-0/+20
|\ \
| * | Make spec context more specific, modify standalone option descriptionBoggs2016-05-262-5/+6
| * | Add standalone flag to binstubs, fix #4594Boggs2016-05-253-0/+19
* | | Merge tag 'v1.12.5'Samuel Giddins2016-05-252-1/+8
|\ \ \
| * | | Version 1.12.5 with changelogv1.12.5Samuel Giddins2016-05-252-1/+8
| * | | Auto merge of #4607 - will-in-wi:clean_up_workers, r=segiddinsHomu2016-05-252-1/+25
| * | | Auto merge of #4611 - BrianHawley:fix_20160524_require_env, r=segiddinsHomu2016-05-252-3/+27
| * | | Auto merge of #4598 - bundler:seg-exec-help-with-dash, r=RochesterinNYCHomu2016-05-254-107/+72
* | | | Auto merge of #4607 - will-in-wi:clean_up_workers, r=segiddinsHomu2016-05-262-1/+25
|\ \ \ \
| * | | | Remove useless comment.William Johnston2016-05-241-1/+0
| * | | | Fix issue with older versions of Ruby and URI.William Johnston2016-05-241-1/+1
| * | | | Fix code syntax testWilliam Johnston2016-05-241-1/+1
| * | | | Ack, forgot RubocopWilliam Johnston2016-05-241-2/+2
| * | | | Add test for thread issueWilliam Johnston2016-05-241-0/+25
| * | | | Switch to tapWilliam Johnston2016-05-241-4/+1
| * | | | Clean up worker threads once done with them.William Johnston2016-05-241-1/+4
| | |/ / | |/| |
* | | | Auto merge of #4611 - BrianHawley:fix_20160524_require_env, r=segiddinsHomu2016-05-262-3/+27
|\ \ \ \ | |/ / / |/| | |
| * | | Fix the combination of gem :require and env or install_ifBrian Hawley2016-05-242-3/+27
|/ / /
* | | Auto merge of #4598 - bundler:seg-exec-help-with-dash, r=RochesterinNYCHomu2016-05-244-107/+72
|\ \ \ | |_|/ |/| |