summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [CLI] Skip the outdated bundler check when MD5 is not availableseg-outdated-fipsSamuel Giddins2017-12-301-0/+2
* Merge tag 'v1.16.1'Samuel Giddins2017-12-2722-170/+219
|\
| * Version 1.16.1 with changelogv1.16.1Samuel Giddins2017-12-212-1/+14
| * Added workarounds for Travis specific issues.SHIBATA Hiroshi2017-12-214-10/+14
| * Try to get specs passing on old RubyGemsSamuel Giddins2017-12-217-35/+49
| * Remove the bundler default spec consistently across ruby versionsSamuel Giddins2017-12-211-2/+9
| * Fix the pristine spec so it still can access the default gemSamuel Giddins2017-12-212-1/+2
| * Unregister the bundler default spec in the testsSamuel Giddins2017-12-212-14/+14
| * [Travis] Use the old trusty image temporarilySamuel Giddins2017-12-121-0/+3
| * Auto merge of #6200 - voxik:relax-directory-restrictions, r=segiddinsThe Bundler Bot2017-12-121-1/+1
| * Auto merge of #6188 - bundler:indirect/fix-6072, r=indirectThe Bundler Bot2017-12-121-34/+32
| * Auto merge of #6194 - voxik:fix-version-replacement-in-lockfile, r=segiddinsThe Bundler Bot2017-12-121-1/+1
| * Auto merge of #6145 - halfbyte:reduce_dependency_trees_bailout, r=segiddinsThe Bundler Bot2017-12-121-0/+2
| * Auto merge of #6207 - bundler:colby/init-gemfile-path-child, r=segiddinsThe Bundler Bot2017-12-122-32/+40
| * Auto merge of #6212 - hsbt:prepare-v1.16.1, r=hsbtThe Bundler Bot2017-12-1226-34/+187
| |\
| | * rubocop -aSHIBATA Hiroshi2017-12-111-33/+35
| | * skip old versions for rack dependency problem.SHIBATA Hiroshi2017-12-111-1/+1
| | * Auto merge of #6202 - hsbt:warning-bundler-binstub, r=hsbtThe Bundler Bot2017-12-112-1/+28
| | * Auto merge of #6201 - jetthoughts:binstub-use-gemfile-from-env, r=indirectThe Bundler Bot2017-12-112-3/+32
| | * Auto merge of #6209 - hsbt:ignore-doc-templates, r=colby-swandaleThe Bundler Bot2017-12-111-0/+1
| | * Auto merge of #6188 - bundler:indirect/fix-6072, r=indirectThe Bundler Bot2017-12-116-9/+50
| | * Auto merge of #6195 - dr-itz:unbreak-warbler, r=segiddinsThe Bundler Bot2017-12-111-0/+2
| | * Auto merge of #6186 - greysteil:treat-release-preference-as-constraint, r=ind...The Bundler Bot2017-12-113-1/+24
| | * Auto merge of #6157 - mattbrictson:fix-nomethoderror-bundle-update-group, r=i...The Bundler Bot2017-12-112-1/+20
| | * Auto merge of #6078 - hsbt:rename-travis-template, r=olleolleolleThe Bundler Bot2017-12-112-1/+1
| | * Auto merge of #6007 - hsbt:use-halper-methods-for-path, r=segiddinsThe Bundler Bot2017-12-118-19/+28
| |/
| * Auto merge of #6203 - hsbt:fixed-uri-changes-ruby25, r=hsbtThe Bundler Bot2017-12-1110-116/+116
| |\
| | * Fixed failing examples for Bundler 2 APISHIBATA Hiroshi2017-12-112-3/+3
| | * Fixed failing examples with Ruby 2.5.SHIBATA Hiroshi2017-12-1110-113/+113
| * | Auto merge of #6117 - hsbt:backport-6080, r=hsbtThe Bundler Bot2017-12-111-1/+1
| |\ \ | | |/ | |/|
| | * Rename `-rubygerms` option. It only needs with Ruby 1.8 and Ruby 2.5 will rem...SHIBATA Hiroshi2017-12-111-1/+1
| |/
| * Auto merge of #6204 - hsbt:fix-travis, r=hsbtThe Bundler Bot2017-12-114-6/+18
| |\
| | * Fixed broken examples on Travis CI.SHIBATA Hiroshi2017-12-094-6/+18
| |/
* | Auto merge of #6229 - erikj:patch-1, r=segiddinsThe Bundler Bot2017-12-271-1/+1
|\ \
| * | correct typo in binstubs man pageErik Johnson2017-12-261-1/+1
|/ /
* | Auto merge of #6222 - toy:patch-1, r=colby-swandaleThe Bundler Bot2017-12-241-1/+1
|\ \
| * | Fix codeclimate badgeIvan Kuchin2017-12-231-1/+1
* | | Auto merge of #6224 - bundler:fix-ruby18-test, r=hsbtThe Bundler Bot2017-12-231-1/+2
|\ \ \ | |/ / |/| |
| * | Re-order gem dependency for Ruby 1.8 build matrix.fix-ruby18-testSHIBATA Hiroshi2017-12-241-1/+2
|/ /
* | Auto merge of #6207 - bundler:colby/init-gemfile-path-child, r=segiddinsThe Bundler Bot2017-12-112-32/+40
|\ \
| * | scope specs to their bundler version and remove duplicate testcolby/init-gemfile-path-childColby Swandale2017-12-111-40/+35
| * | Let users generate gemfiles in paths whos parent path contains a GemfileColby Swandale2017-12-092-8/+21
* | | Auto merge of #6202 - hsbt:warning-bundler-binstub, r=hsbtThe Bundler Bot2017-12-112-1/+28
|\ \ \
| * | | Added test example for binstub warningSHIBATA Hiroshi2017-12-051-0/+19
| * | | expand toplevel method definition about stub file detectionSHIBATA Hiroshi2017-12-051-6/+7
| * | | Show warning message about binstub outside generation.SHIBATA Hiroshi2017-12-051-1/+8
* | | | Auto merge of #6209 - hsbt:ignore-doc-templates, r=colby-swandaleThe Bundler Bot2017-12-111-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Ignore to generate documentation of templates.SHIBATA Hiroshi2017-12-111-0/+1
|/ / /
* | | Auto merge of #6201 - jetthoughts:binstub-use-gemfile-from-env, r=indirectThe Bundler Bot2017-12-052-3/+32
|\ \ \
| * | | Setup Gemfile path before loading bundler in order to use original GemfilePaul Nikitochkin2017-12-022-3/+32