summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Deal with ENOEXECenoexecFelipe Tanus2015-11-301-1/+1
* Merge tag 'v1.11.0.pre.1'Samuel Giddins2015-11-292-1/+64
|\
| * Update changelog for 1.11.0.pre.1v1.11.0.pre.1Samuel Giddins2015-11-292-1/+64
|/
* Merge pull request #4129 from JuanitoFatas/doc/lock-update-optionSamuel E. Giddins2015-11-281-2/+19
|\
| * Documents lock command's `--update` option [ci skip].JuanitoFatas2015-11-281-2/+19
|/
* Auto merge of #4127 - TimMoore:comment-on-git-vs-https-github-urls, r=segiddinsHomu2015-11-281-0/+13
|\
| * Explain why we don't use HTTPS for github sourcesTim Moore2015-11-281-0/+13
|/
* Auto merge of #4124 - bundler:seg-rubocop, r=indirectHomu2015-11-2769-469/+296
|\
| * [RuboCop] Enable Lint/NonLocalExitFromIteratorseg-rubocopSamuel Giddins2015-11-262-6/+1
| * [RuboCop] Disable Style/MultilineBlockChainSamuel Giddins2015-11-262-5/+3
| * [RuboCop] Enable Style/SingleLineBlockParamsSamuel Giddins2015-11-262-6/+3
| * [RuboCop] Enable Style/ParallelAssignmentSamuel Giddins2015-11-266-23/+26
| * [RuboCop] Enable Style/MultilineOperationIndentationSamuel Giddins2015-11-263-9/+3
| * [RuboCop] Enable Style/IfUnlessModifierSamuel Giddins2015-11-2613-72/+18
| * [RuboCop] Enable Style/EmptyLinesAroundModuleBodySamuel Giddins2015-11-2610-25/+0
| * [RuboCop] Enable Style/EmptyElseSamuel Giddins2015-11-263-12/+0
| * [RuboCop] Enable Style/NextSamuel Giddins2015-11-268-92/+69
| * [RuboCop] Enable Style/PercentLiteralDelimitersSamuel Giddins2015-11-2634-75/+69
| * [RuboCop] Disable Style/PerlBackrefsSamuel Giddins2015-11-262-13/+3
| * [RuboCop] Enable Style/CaseIndentationSamuel Giddins2015-11-262-18/+12
| * [RuboCop] Enable Style/BlockDelimitersSamuel Giddins2015-11-2618-54/+48
| * [RuboCop] Enable Style/AndOrSamuel Giddins2015-11-2611-32/+16
| * [RuboCop] Enable Style/RedundantSelfSamuel Giddins2015-11-268-19/+7
| * [RuboCop] Enable Style/RescueModifierSamuel Giddins2015-11-266-16/+26
* | Auto merge of #4114 - smellsblue:restrict-gemspec-platforms, r=segiddinsHomu2015-11-273-1/+43
|\ \
| * | When loading a gem from a gemspec, restrict to the platforms defined in the g...Mike Virata-Stone2015-11-183-1/+43
* | | Auto merge of #4105 - JuanitoFatas:feature/lock-takes-gems, r=indirectHomu2015-11-273-4/+18
|\ \ \
| * | | Add support for specify gems via --update option for `bundle lock` commandJuanitoFatas2015-11-173-4/+18
| |/ /
* | | Auto merge of #4103 - jingweno:master, r=indirectHomu2015-11-272-5/+12
|\ \ \
| * | | Retry `Fetcher#specs` with `Bundler::Retry`Jingwen Owen Ou2015-11-112-5/+12
* | | | Auto merge of #4021 - jaym:bin-move, r=segiddinsHomu2015-11-272-1/+17
|\ \ \ \
| * | | | Add spec to make sure we can call bundler from a bundle execd programJay Mundrawala2015-10-201-0/+16
| * | | | Use exe instead of bin for BUNDLE_BIN_PATH fallbackJay Mundrawala2015-10-191-1/+1
* | | | | Auto merge of #4120 - CoralineAda:contributor_covenant_1_3_0, r=indirectHomu2015-11-272-13/+42
|\ \ \ \ \
| * | | | | Updates Contributor Covenant to 1.3.0CoralineAda2015-11-242-13/+42
| | |_|_|/ | |/| | |
* | | | | Auto merge of #4123 - bundler:seg-fix-realworld-specs, r=segiddinsHomu2015-11-271-3/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix edgecases spec for new gxapi_rails versionSamuel Giddins2015-11-261-3/+4
|/ / / /
* | | | Auto merge of #4113 - blackxored:silence-root-warning, r=segiddinsHomu2015-11-224-5/+33
|\ \ \ \
| * | | | Promote silence_root_warning to Bundler.settings option, fix style issuesAdrian Perez2015-11-184-9/+22
| * | | | Check SILENCE_ROOT_WARNING env to skip warning on root install cmdsAdrian Perez2015-11-173-4/+19
* | | | | Auto merge of #4110 - felixbuenemann:fix-bundle-console-irb-fallback, r=segid...Homu2015-11-223-5/+51
|\ \ \ \ \
| * | | | | Fix `bundle console` IRB fallbackFelix Bünemann2015-11-161-1/+2
| * | | | | Fix bundle console specsFelix Bünemann2015-11-162-4/+49
| | |_|_|/ | |/| | |
* | | | | Auto merge of #4117 - bundler:seg-rubocop-0.35.1, r=segiddinsHomu2015-11-223-13/+23
|\ \ \ \ \
| * | | | | [RuboCop] Update to 0.35.1seg-rubocop-0.35.1Samuel Giddins2015-11-213-13/+23
|/ / / / /
* | | | | Auto merge of #4063 - A5308Y:master, r=segiddinsHomu2015-11-188-67/+102
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | My goal was to reveal the main part of install_gem_from_spec. From myAndreas Hellwig2015-10-278-67/+102
* | | | | Merge pull request #4108 from JuanitoFatas/doc/man-bundle-lockAndré Arko2015-11-171-0/+30
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add a basic bundle lock manual [ci skip]JuanitoFatas2015-11-131-0/+30
|/ / / /
* | | | Auto merge of #4080 - toolmantim:patch-1, r=segiddinsHomu2015-11-131-1/+2
|\ \ \ \