summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [Inline] Installs quietly from git if necessary when the install option is no...seg-inline-git-auto-installSamuel Giddins2016-06-092-1/+19
* Auto merge of #4625 - chalkos:bf-fix-4593, r=segiddinsHomu2016-06-094-1/+96
|\
| * specs handle ruby dev versionsBruno Ferreira2016-06-081-0/+2
| * changed code and specs according to suggestionsBruno Ferreira2016-06-083-53/+39
| * Fixes #4593 and adds related specsBruno Ferreira2016-06-084-1/+108
|/
* Merge pull request #4645 from bundler/seg-ruby-rubygems-version-fail-fastAndré Arko2016-06-072-3/+39
|\
| * [Installer] Fail fast when required_ruby(gems)?_version doesn't matchseg-ruby-rubygems-version-fail-fastSamuel Giddins2016-06-052-3/+39
* | Auto merge of #4580 - bundler:seg-resolver-performance, r=indirectHomu2016-06-0712-87/+71
|\ \
| * | Update bundler spec for more complete conflict messageseg-resolver-performanceSamuel Giddins2016-06-061-0/+7
| * | [RuboCop] Fix SpacingSamuel Giddins2016-06-041-1/+1
| * | [Resolver] Deal with Gem::Version hash and == not aligningSamuel Giddins2016-06-041-2/+7
| * | [Index] Delete unused code & micro-optimizeSamuel Giddins2016-06-041-26/+13
| * | [RuboCop] Fix violationsSamuel Giddins2016-06-021-5/+1
| * | [Index] Don't calculate Platform#to_s twiceSamuel Giddins2016-06-021-3/+6
| * | [Resolver] Drop unused empty array allocationsSamuel Giddins2016-06-021-4/+2
| * | Use Array#concat instead of push(*ary)Samuel Giddins2016-06-026-8/+8
| * | [RemoteSpecification] Add #to_sSamuel Giddins2016-06-021-0/+4
| * | [EndpointSpecification] Stop allocating intermediary arraysSamuel Giddins2016-06-022-7/+8
| * | fixup! 87e203cSamuel Giddins2016-06-021-8/+0
| * | fixup! [Resolver] Improve calculating amount_constrainedSamuel Giddins2016-06-021-2/+2
| * | [RuboCop] Fix style issuesSamuel Giddins2016-06-022-4/+2
| * | [Resolver] Speed up searchingSamuel Giddins2016-06-021-9/+6
| * | [Resolver] Improve calculating amount_constrainedSamuel Giddins2016-06-021-7/+9
| * | [RemoteSpecification] Avoid allocating an object every method_missingSamuel Giddins2016-06-021-5/+1
| * | [Index] Speed up searchingSamuel Giddins2016-06-021-4/+2
* | | Auto merge of #4617 - allenzhao:path-development, r=RochesterinNYCHomu2016-06-063-8/+54
|\ \ \ | |_|/ |/| |
| * | Add spec test and fix logic in definition#converge_dependenciesAllen Zhao2016-06-043-5/+47
| * | Add logic to check if the issue is path source relatedAllen Zhao2016-05-261-10/+14
* | | 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