summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [Settings] Use filesystem_access block to read config fileseg-config-load-filesystem-accessSamuel Giddins2015-12-151-5/+3
* Auto merge of #4155 - RochesterinNYC:add-more-http-exceptions-to-not-retry-on...Homu2015-12-151-1/+4
|\
| * Add more exception classes not to retry on to the FetcherJames Wen2015-12-131-1/+4
* | Auto merge of #4161 - RochesterinNYC:fix-package-all-recursive-copy-bug, r=in...Homu2015-12-152-0/+52
|\ \ | |/ |/|
| * Fix broken `bundle package --all` command and prevent endless recursive copyJames Wen2015-12-152-0/+52
|/
* Update SSL checks now that gems are from FastlyAndre Arko2015-12-131-2/+1
* bump some features out of the bugfix listAndre Arko2015-12-131-8/+8
* [CHANGELOG] Remove merge conflict markersSamuel Giddins2015-12-121-3/+0
* Merge tag 'v1.11.0'Samuel Giddins2015-12-122-1/+8
|\
| * Update changelog for 1.11.0v1.11.0Samuel Giddins2015-12-122-1/+5
| * Update changelog for 1.11.0.pre.2v1.11.0.pre.2Samuel Giddins2015-12-062-1/+8
| * [GemHelper] Fix crash when pushing gemSamuel Giddins2015-12-061-1/+1
| * Deal with ENOEXECFelipe Tanus2015-12-061-1/+1
* | Looks like Ubuntu changed the package nameAndre Arko2015-12-131-1/+1
* | remove already-implied else4064Andre Arko2015-12-121-2/+0
* | Merge pull request #4064 from pivotal-cf-experimental/masterAndre Arko2015-12-1213-65/+443
|\ \
| * | Adds rubocop fixes.David Morhovich2015-11-192-2/+1
| * | Merge remote-tracking branch 'remotes/upstream/master'David Morhovich2015-11-1816-106/+217
| |\ \
| * | | Changes for https://github.com/bundler/bundler/pull/4064#discussion-diff-4513...David Morhovich2015-11-183-2/+33
| * | | Changes for https://github.com/bundler/bundler/pull/4064#discussion-diff-4513...David Morhovich2015-11-181-5/+44
| * | | Changes for https://github.com/bundler/bundler/pull/4064#discussion-diff-4513...David Morhovich2015-11-182-2/+2
| * | | Changes for https://github.com/bundler/bundler/pull/4064#discussion-diff-4513...David Morhovich2015-11-184-16/+16
| * | | Merge branch 'master' into upstream_masterBrandon Shroyer2015-11-1214-98/+405
| |\ \ \
| | * | | Adds ruby version to Gemfile.lock.David Morhovich2015-10-2710-12/+260
| | * | | Merge remote-tracking branch 'version/master'JT Archie2015-10-206-86/+145
| | |\ \ \
| | | * | | Allow fuzzy ruby version requirements.Pan Thomakos2015-04-177-53/+118
* | | | | | Update changelog for 1.11.0.pre.2Samuel Giddins2015-12-062-1/+8
* | | | | | Merge pull request #4139 from benlovell/travis-container-based-infrastructureAndré Arko2015-12-061-0/+1
|\ \ \ \ \ \
| * | | | | | Use travis container-based infrastructureBen Lovell2015-12-021-0/+1
* | | | | | | Auto merge of #4130 - bundler:seg-fix-rake-push, r=segiddinsHomu2015-12-011-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [GemHelper] Fix crash when pushing gemseg-fix-rake-pushSamuel Giddins2015-11-291-1/+1
* | | | | | | | Auto merge of #4132 - bundler:enoexec, r=segiddinsHomu2015-12-011-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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