summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Speed up no-op installsseg-speed-up-no-op-installSamuel Giddins2017-07-194-61/+92
* Auto merge of #5871 - greysteil:extensions-array, r=segiddinsThe Bundler Bot2017-07-182-1/+11
|\
| * Fall back to `super` in all EndpointSpecification attribute methodsGrey Baker2017-07-181-1/+3
| * Return an empty array if no extensions are foundGrey Baker2017-07-182-1/+9
* | Auto merge of #5870 - bundler:seg-fix-specs, r=segiddinsThe Bundler Bot2017-07-181-1/+1
|\ \ | |/
| * Fix spec on 2.0 broken with the v1.15.2 mergeseg-fix-specsSamuel Giddins2017-07-171-1/+1
|/
* Merge tag 'v1.15.2'Samuel Giddins2017-07-173-1/+24
|\
| * Version 1.15.2 with changelogv1.15.2Samuel Giddins2017-07-172-1/+19
| * fixup! Auto merge of #5819 - bundler:seg-full-index-invalid-deps, r=indirectSamuel Giddins2017-07-171-2/+3
| * Auto merge of #5855 - bundler:segiddins-spec-deps-update, r=segiddinsThe Bundler Bot2017-07-171-0/+3
| * Auto merge of #5826 - greysteil:handle-invalid-range-errors, r=indirectThe Bundler Bot2017-07-173-3/+79
| * Auto merge of #5848 - bundler:seg-inline-bundle-bin, r=colby-swandaleThe Bundler Bot2017-07-176-5/+25
| * Auto merge of #5817 - NickLaMuro:bug_with_path_gem_source_equivalency, r=segi...The Bundler Bot2017-07-173-1/+43
| * Auto merge of #5819 - bundler:seg-full-index-invalid-deps, r=indirectThe Bundler Bot2017-07-172-1/+33
| * Auto merge of #5809 - bundler:seg-config-converted-value, r=indirectThe Bundler Bot2017-07-172-12/+26
| * Auto merge of #5801 - jakauppila:fix_no_proxy_patch, r=segiddinsThe Bundler Bot2017-07-172-0/+17
| * Auto merge of #5804 - bundler:seg-remove-postit-trampoline, r=indirectThe Bundler Bot2017-07-1717-470/+5
| * Auto merge of #5791 - bundler:seg-verbose-cli-print-no-defaults, r=colby-swan...The Bundler Bot2017-07-172-4/+15
| * Auto merge of #5785 - bundler:colby/fix-group-conflict-error, r=segiddinsThe Bundler Bot2017-07-171-1/+1
| * Auto merge of #5729 - HippoDippo:patch-1, r=colby-swandaleThe Bundler Bot2017-07-171-1/+1
| * Auto merge of #5728 - bundler:seg-bundle-gem-github-source, r=indirectThe Bundler Bot2017-07-172-0/+4
| * Auto merge of #5723 - slimeate:fix-headers-in-contributing-readme, r=segiddinsThe Bundler Bot2017-07-171-5/+5
| * Auto merge of #5713 - bundler:seg-viz-other-gem, r=indirectThe Bundler Bot2017-07-173-4/+48
| * Auto merge of #5707 - bundler:seg-sort-by-name-spec-set, r=indirectThe Bundler Bot2017-07-172-9/+38
* | Auto merge of #5867 - bundler:seg-release-patch-change-version-after-checkout...The Bundler Bot2017-07-171-5/+5
|\ \
| * | [Rakefile] In a patch release, change version after checkoutseg-release-patch-change-version-after-checkoutSamuel Giddins2017-07-171-5/+5
|/ /
* | Auto merge of #5864 - koic:enable_layout_empty_line_after_magic_comment_cop, ...The Bundler Bot2017-07-16198-5/+197
|\ \
| * | [RuboCop] Enable Layout/EmptyLineAfterMagicComment copKoichi ITO2017-07-16198-5/+197
* | | Auto merge of #5852 - stefansedich:add-process-lock, r=indirectThe Bundler Bot2017-07-154-14/+63
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' of https://github.com/bundler/bundler into add-process-...Stefan Sedich2017-07-1222-63/+233
| |\ \
| * | | Handle case where user does not have write access and add an explict unlock a...Stefan Sedich2017-07-111-5/+8
| * | | Adding process lock for bundle install operations to fix issue where multiple...Stefan Sedich2017-07-114-14/+60
* | | | Auto merge of #5853 - koic:change_deprecation_from_list_to_show, r=indirectThe Bundler Bot2017-07-133-6/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | Change deprecation from `bundle list` to `bundle show`Koichi ITO2017-07-093-6/+6
* | | | Auto merge of #5843 - bundler:seg-deployment-means-frozen, r=indirectThe Bundler Bot2017-07-1220-62/+168
|\ \ \ \
| * | | | Update the docs to make frozen/deployment clearerseg-deployment-means-frozenSamuel Giddins2017-07-121-3/+5
| * | | | Fix deployment specs under 2.0Samuel Giddins2017-07-129-25/+94
| * | | | Use deployment instead of frozen as a setting on Bundler 2Samuel Giddins2017-07-1214-39/+74
|/ / / /
* | | | Auto merge of #5858 - bundler:seg-lockfile-parser-unit-tests, r=segiddinsThe Bundler Bot2017-07-111-0/+59
|\ \ \ \
| * | | | Add some unit tests for lockfile parsingSamuel Giddins2017-07-111-0/+59
|/ / / /
* | | | Auto merge of #5850 - bundler:seg-corrupted-lockfile-show-tree, r=segiddinsThe Bundler Bot2017-07-111-1/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | [ParallelInstaller] Show require tree when a gem fails to install due to corr...seg-corrupted-lockfile-show-treeSamuel Giddins2017-07-071-1/+6
* | | | Auto merge of #5857 - xxx:master, r=colby-swandaleThe Bundler Bot2017-07-111-1/+1
|\ \ \ \
| * | | | Use https for the opensource.org link in README template, which you're redire...mpd2017-07-101-1/+1
| | |/ / | |/| |
* | | | Auto merge of #5855 - bundler:segiddins-spec-deps-update, r=segiddinsThe Bundler Bot2017-07-111-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Limit specs to rack-test < 0.7.0 for Ruby 1.8.7 compatibilitysegiddins-spec-deps-updateSamuel Giddins2017-07-101-0/+3
|/ / /
* | | Auto merge of #5838 - bundler:seg-make-gem-private, r=indirectThe Bundler Bot2017-07-084-4/+39
|\ \ \
| * | | Make Bundler.setup not make Kernel#gem public in Bundler 2seg-make-gem-privateSamuel Giddins2017-07-074-4/+39
| |/ /
* | | Auto merge of #5826 - greysteil:handle-invalid-range-errors, r=indirectThe Bundler Bot2017-07-083-3/+79
|\ \ \
| * | | Make CompactIndexPartialUpdate artifice deterministicGrey Baker2017-07-051-9/+8
View Lorry Controller Status