summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [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
|\ \ \ | |_|/ |/| |
| * | [CLI] Only redirect to help whel first two args are help and execseg-exec-help-with-dashSamuel Giddins2016-05-234-107/+72
* | | Auto merge of #4601 - RochesterinNYC:specify-no-usage-of-ci-skip, r=segiddinsHomu2016-05-231-0/+2
|\ \ \ | |/ / |/| |
| * | [Documentation] Add instruction to not use CI skipping mechanismsJames Wen2016-05-221-0/+2
|/ /
* | Auto merge of #4585 - RochesterinNYC:eval-gemfile-expanded-pathing, r=segiddinsHomu2016-05-212-1/+47
|\ \
| * | Add integration spec for restoring `@gemfile` after `eval_gemfile`James Wen2016-05-182-6/+23
| * | Restore original gemfile to `@gemfile` after nested `eval_gemfile`James Wen2016-05-181-1/+5
| * | Use the full expanded path of passed Gemfile during `eval_gemfile`James Wen2016-05-182-1/+26
* | | Merge tag 'v1.12.4'Samuel Giddins2016-05-162-1/+9
|\ \ \ | | |/ | |/|
| * | Version 1.12.4 with changelogv1.12.4Samuel Giddins2016-05-162-1/+9
| * | Auto merge of #4558 - bundler:seg-index-platform-ruby-default, r=segiddinsHomu2016-05-162-2/+31
| * | Auto merge of #4446 - Cohen-Carlisle:non-rubygem-push, r=segiddinsHomu2016-05-161-3/+3
| * | Auto merge of #4386 - bundler:seg-fix-dash-pre, r=segiddinsHomu2016-05-162-1/+12
| * | Auto merge of #4561 - domcleal:4519-concurrent-ci-updater, r=indirectHomu2016-05-164-23/+90
* | | Auto merge of #4558 - bundler:seg-index-platform-ruby-default, r=segiddinsHomu2016-05-162-2/+31
|\ \ \