summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [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
| * | Avoid Range Not Satisfiable errors during normal request flowGrey Baker2017-07-043-3/+80
* | | Auto merge of #5837 - bundler:seg-default-gem-activation-spec-hack, r=segiddinsThe Bundler Bot2017-07-081-10/+14
|\ \ \
| * | | Improve logging in default gem activation specsseg-default-gem-activation-spec-hackSamuel Giddins2017-07-071-10/+14
* | | | Auto merge of #5848 - bundler:seg-inline-bundle-bin, r=colby-swandaleThe Bundler Bot2017-07-086-5/+25
|\ \ \ \ | |_|_|/ |/| | |
| * | | [Inline] Work when BUNDLE_BIN is setseg-inline-bundle-binSamuel Giddins2017-07-076-5/+25
|/ / /
* | | Auto merge of #5834 - koic:tweak_gemspec_template_when_using_ruby_2_x, r=segi...The Bundler Bot2017-07-071-0/+2
|\ \ \ | |/ / |/| |
| * | Tweak gemspec template when using Ruby 2.xKoichi ITO2017-07-031-0/+2
* | | Auto merge of #5841 - koic:capitalize_description_lines_in_bundler_2_0, r=seg...The Bundler Bot2017-07-061-4/+4
|\ \ \
| * | | Capitalize the description lines in Bundler 2Koichi ITO2017-07-061-4/+4
* | | | Auto merge of #5839 - bundler:seg-sort-documented-settings, r=colby-swandaleThe Bundler Bot2017-07-063-100/+121
|\ \ \ \ | |/ / / |/| | |
| * | | Sort all documented settings in the bundle-config man pageseg-sort-documented-settingsSamuel Giddins2017-07-052-100/+107
| * | | Add a be_sorted matcherSamuel Giddins2017-07-051-0/+14
* | | | Auto merge of #5817 - NickLaMuro:bug_with_path_gem_source_equivalency, r=segi...The Bundler Bot2017-07-053-1/+43
|\ \ \ \ | |/ / / |/| | |
| * | | Compare sources using source's rootNick LaMuro2017-06-293-1/+43
* | | | Auto merge of #5818 - bundler:seg-bundler-2-specific-platform, r=indirectThe Bundler Bot2017-07-0521-94/+142
|\ \ \ \
| * | | | [Definition] Only sort platforms once in expand_dependenciesseg-bundler-2-specific-platformSamuel Giddins2017-07-052-9/+8
| * | | | Update specs for the specific platform being added to the lockfileSamuel Giddins2017-07-0514-80/+115
| * | | | Update specs that simulate 2.0 lockfiles to include the specific platformSamuel Giddins2017-07-051-0/+2
| * | | | Enable specific_platform by default on 2.0Samuel Giddins2017-07-057-7/+19
|/ / / /
* | | | Auto merge of #5819 - bundler:seg-full-index-invalid-deps, r=indirectThe Bundler Bot2017-07-052-1/+33
|\ \ \ \
| * | | | [RemoteSpecification] Fail gracefully when deps is an array of array of strin...seg-full-index-invalid-depsSamuel Giddins2017-07-042-1/+33
| | |_|/ | |/| |
* | | | Auto merge of #5798 - bundler:seg-new-cache-is-package, r=indirectThe Bundler Bot2017-07-055-8/+24
|\ \ \ \
| * | | | Use the Package command for `bundle cache` on Bundler 2seg-new-cache-is-packageSamuel Giddins2017-07-035-8/+24
| |/ / /
* | | | Auto merge of #5829 - bundler:colby/vcr-cassettes-illegal-path-chars, r=segid...The Bundler Bot2017-07-053-1/+1
|\ \ \ \
| * | | | remove forbidden chars in cassettes pathnamecolby/vcr-cassettes-illegal-path-charsColby Swandale2017-07-043-1/+1
View Lorry Controller Status