| Commit message (Expand) | Author | Age | Files | Lines |
* | Fix spec on 2.0 broken with the v1.15.2 mergeseg-fix-specs | Samuel Giddins | 2017-07-17 | 1 | -1/+1 |
* | Merge tag 'v1.15.2' | Samuel Giddins | 2017-07-17 | 3 | -1/+24 |
|\ |
|
| * | Version 1.15.2 with changelogv1.15.2 | Samuel Giddins | 2017-07-17 | 2 | -1/+19 |
| * | fixup! Auto merge of #5819 - bundler:seg-full-index-invalid-deps, r=indirect | Samuel Giddins | 2017-07-17 | 1 | -2/+3 |
| * | Auto merge of #5855 - bundler:segiddins-spec-deps-update, r=segiddins | The Bundler Bot | 2017-07-17 | 1 | -0/+3 |
| * | Auto merge of #5826 - greysteil:handle-invalid-range-errors, r=indirect | The Bundler Bot | 2017-07-17 | 3 | -3/+79 |
| * | Auto merge of #5848 - bundler:seg-inline-bundle-bin, r=colby-swandale | The Bundler Bot | 2017-07-17 | 6 | -5/+25 |
| * | Auto merge of #5817 - NickLaMuro:bug_with_path_gem_source_equivalency, r=segi... | The Bundler Bot | 2017-07-17 | 3 | -1/+43 |
| * | Auto merge of #5819 - bundler:seg-full-index-invalid-deps, r=indirect | The Bundler Bot | 2017-07-17 | 2 | -1/+33 |
| * | Auto merge of #5809 - bundler:seg-config-converted-value, r=indirect | The Bundler Bot | 2017-07-17 | 2 | -12/+26 |
| * | Auto merge of #5801 - jakauppila:fix_no_proxy_patch, r=segiddins | The Bundler Bot | 2017-07-17 | 2 | -0/+17 |
| * | Auto merge of #5804 - bundler:seg-remove-postit-trampoline, r=indirect | The Bundler Bot | 2017-07-17 | 17 | -470/+5 |
| * | Auto merge of #5791 - bundler:seg-verbose-cli-print-no-defaults, r=colby-swan... | The Bundler Bot | 2017-07-17 | 2 | -4/+15 |
| * | Auto merge of #5785 - bundler:colby/fix-group-conflict-error, r=segiddins | The Bundler Bot | 2017-07-17 | 1 | -1/+1 |
| * | Auto merge of #5729 - HippoDippo:patch-1, r=colby-swandale | The Bundler Bot | 2017-07-17 | 1 | -1/+1 |
| * | Auto merge of #5728 - bundler:seg-bundle-gem-github-source, r=indirect | The Bundler Bot | 2017-07-17 | 2 | -0/+4 |
| * | Auto merge of #5723 - slimeate:fix-headers-in-contributing-readme, r=segiddins | The Bundler Bot | 2017-07-17 | 1 | -5/+5 |
| * | Auto merge of #5713 - bundler:seg-viz-other-gem, r=indirect | The Bundler Bot | 2017-07-17 | 3 | -4/+48 |
| * | Auto merge of #5707 - bundler:seg-sort-by-name-spec-set, r=indirect | The Bundler Bot | 2017-07-17 | 2 | -9/+38 |
* | | Auto merge of #5867 - bundler:seg-release-patch-change-version-after-checkout... | The Bundler Bot | 2017-07-17 | 1 | -5/+5 |
|\ \ |
|
| * | | [Rakefile] In a patch release, change version after checkoutseg-release-patch-change-version-after-checkout | Samuel Giddins | 2017-07-17 | 1 | -5/+5 |
|/ / |
|
* | | Auto merge of #5864 - koic:enable_layout_empty_line_after_magic_comment_cop, ... | The Bundler Bot | 2017-07-16 | 198 | -5/+197 |
|\ \ |
|
| * | | [RuboCop] Enable Layout/EmptyLineAfterMagicComment cop | Koichi ITO | 2017-07-16 | 198 | -5/+197 |
* | | | Auto merge of #5852 - stefansedich:add-process-lock, r=indirect | The Bundler Bot | 2017-07-15 | 4 | -14/+63 |
|\ \ \
| |/ /
|/| | |
|
| * | | Merge branch 'master' of https://github.com/bundler/bundler into add-process-... | Stefan Sedich | 2017-07-12 | 22 | -63/+233 |
| |\ \ |
|
| * | | | Handle case where user does not have write access and add an explict unlock a... | Stefan Sedich | 2017-07-11 | 1 | -5/+8 |
| * | | | Adding process lock for bundle install operations to fix issue where multiple... | Stefan Sedich | 2017-07-11 | 4 | -14/+60 |
* | | | | Auto merge of #5853 - koic:change_deprecation_from_list_to_show, r=indirect | The Bundler Bot | 2017-07-13 | 3 | -6/+6 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Change deprecation from `bundle list` to `bundle show` | Koichi ITO | 2017-07-09 | 3 | -6/+6 |
* | | | | Auto merge of #5843 - bundler:seg-deployment-means-frozen, r=indirect | The Bundler Bot | 2017-07-12 | 20 | -62/+168 |
|\ \ \ \ |
|
| * | | | | Update the docs to make frozen/deployment clearerseg-deployment-means-frozen | Samuel Giddins | 2017-07-12 | 1 | -3/+5 |
| * | | | | Fix deployment specs under 2.0 | Samuel Giddins | 2017-07-12 | 9 | -25/+94 |
| * | | | | Use deployment instead of frozen as a setting on Bundler 2 | Samuel Giddins | 2017-07-12 | 14 | -39/+74 |
|/ / / / |
|
* | | | | Auto merge of #5858 - bundler:seg-lockfile-parser-unit-tests, r=segiddins | The Bundler Bot | 2017-07-11 | 1 | -0/+59 |
|\ \ \ \ |
|
| * | | | | Add some unit tests for lockfile parsing | Samuel Giddins | 2017-07-11 | 1 | -0/+59 |
|/ / / / |
|
* | | | | Auto merge of #5850 - bundler:seg-corrupted-lockfile-show-tree, r=segiddins | The Bundler Bot | 2017-07-11 | 1 | -1/+6 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | [ParallelInstaller] Show require tree when a gem fails to install due to corr...seg-corrupted-lockfile-show-tree | Samuel Giddins | 2017-07-07 | 1 | -1/+6 |
* | | | | Auto merge of #5857 - xxx:master, r=colby-swandale | The Bundler Bot | 2017-07-11 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | Use https for the opensource.org link in README template, which you're redire... | mpd | 2017-07-10 | 1 | -1/+1 |
| | |/ /
| |/| | |
|
* | | | | Auto merge of #5855 - bundler:segiddins-spec-deps-update, r=segiddins | The Bundler Bot | 2017-07-11 | 1 | -0/+3 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Limit specs to rack-test < 0.7.0 for Ruby 1.8.7 compatibilitysegiddins-spec-deps-update | Samuel Giddins | 2017-07-10 | 1 | -0/+3 |
|/ / / |
|
* | | | Auto merge of #5838 - bundler:seg-make-gem-private, r=indirect | The Bundler Bot | 2017-07-08 | 4 | -4/+39 |
|\ \ \ |
|
| * | | | Make Bundler.setup not make Kernel#gem public in Bundler 2seg-make-gem-private | Samuel Giddins | 2017-07-07 | 4 | -4/+39 |
| |/ / |
|
* | | | Auto merge of #5826 - greysteil:handle-invalid-range-errors, r=indirect | The Bundler Bot | 2017-07-08 | 3 | -3/+79 |
|\ \ \ |
|
| * | | | Make CompactIndexPartialUpdate artifice deterministic | Grey Baker | 2017-07-05 | 1 | -9/+8 |
| * | | | Avoid Range Not Satisfiable errors during normal request flow | Grey Baker | 2017-07-04 | 3 | -3/+80 |
* | | | | Auto merge of #5837 - bundler:seg-default-gem-activation-spec-hack, r=segiddins | The Bundler Bot | 2017-07-08 | 1 | -10/+14 |
|\ \ \ \ |
|
| * | | | | Improve logging in default gem activation specsseg-default-gem-activation-spec-hack | Samuel Giddins | 2017-07-07 | 1 | -10/+14 |
* | | | | | Auto merge of #5848 - bundler:seg-inline-bundle-bin, r=colby-swandale | The Bundler Bot | 2017-07-08 | 6 | -5/+25 |
|\ \ \ \ \
| |_|_|/ /
|/| | | | |
|
| * | | | | [Inline] Work when BUNDLE_BIN is setseg-inline-bundle-bin | Samuel Giddins | 2017-07-07 | 6 | -5/+25 |
|/ / / / |
|