summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [Errors] Ensure no duplicate status codes are registeredseg-error-registrationSamuel Giddins2016-06-281-1/+11
|
* Merge tag 'v1.13.0.rc.1'Samuel Giddins2016-06-272-1/+18
|\ | | | | | | Version 1.13.0.rc.1
| * Version 1.13.0.rc.1 with changelogv1.13.0.rc.1Samuel Giddins2016-06-272-1/+18
| |
| * Auto merge of #4692 - bundler:seg-fix-trampoline-specs, r=segiddinsHomu2016-06-271-1/+1
| | | | | | | | | | | | Fix hardcoded bundler version string in trampoline specs (cherry picked from commit 7332185811d77a51cc228d7e18ccbe4f5e553f3a)
| * Auto merge of #4700 - bundler:seg-lockfile-frozen-string-old-rg, r=segiddinsHomu2016-06-271-4/+6
| | | | | | | | | | | | | | | | | | | | [LockfileParser] Support for old RG on Ruby 2.3+ Fixes #4698 \c @allenzhao (cherry picked from commit 78d614413a994b5acd3dccd82b0782290d0d850d)
| * Auto merge of #4701 - chrismo:issue-4592-gem-path-empty-string, r=segiddinsHomu2016-06-272-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unset GEM_PATH with nil not empty string. This should fix #4592, the tests all pass, but the line of code in question goes back to 2010, so this sorta seems slightly dangerous, but it's probable the circumstances of hitting this line in conjunction with `bundle exec` is a combination that didn't exist prior to 1.12.x. Issue #4592 has a full diagnosis, but the gist of it is this: if an empty string is passed as the `GEM_PATH` to the subsequent process launched by `bundle exec`, then if the `cmd` portion of `bundle exec` is a ruby shebanged file, then if the current bundle install uses a local path (`disable_shared_gems` is true) then it won't be able to find the bundler gem at all because Bundler doesn't install itself into its own Bundle, it's only installed in the system gems for the Ruby. `nil` must be passed because the RubyGems code that sets up the `GEM_PATH` does a conditional on the current `GEM_PATH` and empty string evaluates to true, whereas `nil` evaluates to false. In the false case the `GEM_PATH` is internally populated with the system gems path such that the bundler gem can be found. (cherry picked from commit 37064b3a900475e684dd090d332b88d4c888c128)
| * Auto merge of #4702 - bundler:seg-major-deprecations, r=indirectHomu2016-06-2711-30/+165
| | | | | | | | | | | | | | | | | | | | Add machinery for printing major deprecations First step towards handling all of #4695 \c @RochesterinNYC @indirect (cherry picked from commit dca6d26833ddd9d9de658bef7274c8fa21014c44)
| * Auto merge of #4712 - bundler:seg-skip-reresolve, r=indirectHomu2016-06-272-3/+24
| | | | | | | | | | | | | | | | [Definition] Add a #change_reason printed in debug @indirect this might make your debugging a bit easier? (cherry picked from commit 378602f073f808046741a829903d6ea6104f619a)
| * Auto merge of #4711 - bundler:seg-spec-for-exe-match-spec-name, r=segiddinsHomu2016-06-273-6/+34
| | | | | | | | | | | | | | | | Prefer spec name matches when searching for an exe Closes #4705. (cherry picked from commit d497e04e336fcb54f6f92acbb6665b84d11ca396)
| * Auto merge of #4713 - bundler:seg-postit-trampoline-load-path, r=segiddinsHomu2016-06-278-27/+21
| | | | | | | | | | | | [Trampoline] Dont change the load path just for postit (cherry picked from commit bacb0e7835996df44681f84bf662dbe0fb9deb30)
| * Auto merge of #4715 - jenseng:fix_absolute_path_message, r=segiddinsHomu2016-06-272-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't incorrectly relativize sibling `--path` with the same prefix Given current working directory `/foo/app`, when you install with `--path /foo/app_cache`, ensure that the messaging says: Bundled gems are installed into /foo/app_cache instead of the incorrect: Bundled gems are installed into ._cache (cherry picked from commit 3b928d83c1b606b4598c6662528b20482762a14d)
| * Auto merge of #4716 - bundler:seg-no-re-resolve-part-deux, r=indirectHomu2016-06-272-16/+38
| | | | | | | | | | | | | | | | [Definition] Just search for changed specs in an exactly matching source \c @indirect (cherry picked from commit faf82ccc97ab2441bd4fe849d12151fb347a81cf)
| * Auto merge of #4718 - bundler:aa-dbundle-no-trampoline, r=segiddinsHomu2016-06-271-2/+2
| | | | | | | | | | | | | | | | disable trampoline in dbundle /cc @segiddins (cherry picked from commit b44d763965d3551a734a57fd828d13f9908d0bad)
| * Auto merge of #4717 - bundler:seg-deinit-submodules, r=indirectHomu2016-06-273-3/+7
| | | | | | | | | | | | [GitProxy] Deinit submodules if they are not requested (cherry picked from commit 5e88c8d494d40157dd1ec9b34be8aafe68431a90)
* | Auto merge of #4717 - bundler:seg-deinit-submodules, r=indirectHomu2016-06-283-3/+7
|\ \ | | | | | | | | | [GitProxy] Deinit submodules if they are not requested
| * | [GitProxy] Only try and submodule deinit on git 2.9.0+seg-deinit-submodulesSamuel Giddins2016-06-273-2/+3
| | |
| * | [GitProxy] Deinit submodules if they are not requestedSamuel Giddins2016-06-242-2/+5
| | |
* | | Auto merge of #4718 - bundler:aa-dbundle-no-trampoline, r=segiddinsHomu2016-06-251-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | disable trampoline in dbundle /cc @segiddins
| * | | disable trampoline in dbundleaa-dbundle-no-trampolineAndre Arko2016-06-241-2/+2
| | | |
* | | | Auto merge of #4716 - bundler:seg-no-re-resolve-part-deux, r=indirectHomu2016-06-252-16/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [Definition] Just search for changed specs in an exactly matching source \c @indirect
| * | | | [Definition] Just search for changed specs in an exactly matching sourceseg-no-re-resolve-part-deuxSamuel Giddins2016-06-241-16/+6
| | | | |
| * | | | Add a spec for not re-resolvingSamuel Giddins2016-06-241-0/+32
| | |/ / | |/| |
* | | | Auto merge of #4715 - jenseng:fix_absolute_path_message, r=segiddinsHomu2016-06-252-1/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't incorrectly relativize sibling `--path` with the same prefix Given current working directory `/foo/app`, when you install with `--path /foo/app_cache`, ensure that the messaging says: Bundled gems are installed into /foo/app_cache instead of the incorrect: Bundled gems are installed into ._cache
| * | | | Don't incorrectly relativize sibling `--path` with the same prefixJon Jensen2016-06-242-1/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given current working directory `/foo/app`, when you install with `--path /foo/app_cache`, ensure that the messaging says: Bundled gems are installed into /foo/app_cache instead of the incorrect: Bundled gems are installed into ._cache
* | | | Auto merge of #4713 - bundler:seg-postit-trampoline-load-path, r=segiddinsHomu2016-06-258-27/+21
|\ \ \ \ | | | | | | | | | | | | | | | [Trampoline] Dont change the load path just for postit
| * | | | [Trampoline] Dont change the load path just for postitseg-postit-trampoline-load-pathSamuel Giddins2016-06-248-27/+21
| | |/ / | |/| |
* | | | Auto merge of #4711 - bundler:seg-spec-for-exe-match-spec-name, r=segiddinsHomu2016-06-253-6/+34
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | Prefer spec name matches when searching for an exe Closes #4705.
| * | | Prefer spec name matches when searching for an exeseg-spec-for-exe-match-spec-nameSamuel Giddins2016-06-243-6/+34
| |/ /
* | | Auto merge of #4712 - bundler:seg-skip-reresolve, r=indirectHomu2016-06-252-3/+24
|\ \ \ | |/ / |/| | | | | | | | | | | [Definition] Add a #change_reason printed in debug @indirect this might make your debugging a bit easier?
| * | [Definition] Add a #change_reason printed in debugseg-skip-reresolveSamuel Giddins2016-06-241-2/+23
| | |
| * | [SpecSet] Don't mutate the skip listSamuel Giddins2016-06-241-1/+1
|/ / | | | | | | This could cause definition to think bundler is being updated
* | Auto merge of #4702 - bundler:seg-major-deprecations, r=indirectHomu2016-06-2411-30/+165
|\ \ | | | | | | | | | | | | | | | | | | | | | Add machinery for printing major deprecations First step towards handling all of #4695 \c @RochesterinNYC @indirect
| * | Fix matching against multiple major deprecationsseg-major-deprecationsSamuel Giddins2016-06-231-2/+2
| | |
| * | [SharedHelpers] Fix printing rubygems versionSamuel Giddins2016-06-231-1/+1
| | |
| * | [Shell] Fix #silenceSamuel Giddins2016-06-231-2/+2
| | |
| * | Add spec for not printing major deprecations with --quietSamuel Giddins2016-06-231-0/+7
| | |
| * | Add spec machinery for testing major deprecationsSamuel Giddins2016-06-232-3/+73
| | |
| * | Print the first batch of major deprecation warningsSamuel Giddins2016-06-235-21/+13
| | |
| * | Add machinery for printing major deprecationsSamuel Giddins2016-06-235-10/+44
| | |
| * | [UI] Add support for printing major deprecationsSamuel Giddins2016-06-233-0/+9
| | |
| * | [Settings] Move keys to their own line & sortSamuel Giddins2016-06-231-3/+26
|/ / | | | | | | Will make future diffs much easier to read
* | Auto merge of #4701 - chrismo:issue-4592-gem-path-empty-string, r=segiddinsHomu2016-06-242-6/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unset GEM_PATH with nil not empty string. This should fix #4592, the tests all pass, but the line of code in question goes back to 2010, so this sorta seems slightly dangerous, but it's probable the circumstances of hitting this line in conjunction with `bundle exec` is a combination that didn't exist prior to 1.12.x. Issue #4592 has a full diagnosis, but the gist of it is this: if an empty string is passed as the `GEM_PATH` to the subsequent process launched by `bundle exec`, then if the `cmd` portion of `bundle exec` is a ruby shebanged file, then if the current bundle install uses a local path (`disable_shared_gems` is true) then it won't be able to find the bundler gem at all because Bundler doesn't install itself into its own Bundle, it's only installed in the system gems for the Ruby. `nil` must be passed because the RubyGems code that sets up the `GEM_PATH` does a conditional on the current `GEM_PATH` and empty string evaluates to true, whereas `nil` evaluates to false. In the false case the `GEM_PATH` is internally populated with the system gems path such that the bundler gem can be found.
| * | Unset `GEM_PATH` with `nil` not empty string.chrismo2016-06-222-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix #4592, the tests all pass, but the line of code in question goes back to 2010, so this sorta seems slightly dangerous, but it's probable the circumstances of hitting this line in conjunction with `bundle exec` is a combination that didn't exist prior to 1.12.x. Issue #4592 has a full diagnosis, but the gist of it is this: if an empty string is passed as the `GEM_PATH` to the subsequent process launched by `bundle exec`, then if the `cmd` portion of `bundle exec` is a ruby shebanged file, then if the current bundle install uses a local path (`disable_shared_gems` is true) then it won't be able to find the bundler gem at all because Bundler doesn't install itself into its own Bundle, it's only installed in the system gems for the Ruby. `nil` must be passed because the RubyGems code that sets up the `GEM_PATH` does a conditional on the current `GEM_PATH` and empty string evaluates to true, whereas `nil` evaluates to false. In the false case the `GEM_PATH` is internally populated with the system gems path such that the bundler gem can be found.
* | | Auto merge of #4700 - bundler:seg-lockfile-frozen-string-old-rg, r=segiddinsHomu2016-06-231-4/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [LockfileParser] Support for old RG on Ruby 2.3+ Fixes #4698 \c @allenzhao
| * | | [LockfileParser] Support for old RG on Ruby 2.3+Samuel Giddins2016-06-221-4/+6
|/ / /
* | | Auto merge of #4694 - bundler:seg-rubygems-merger, r=indirectHomu2016-06-223-11/+24
|\ \ \ | | | | | | | | | | | | Change Rakefile to work as a RubyGems submodule
| * | | [PostItTrampoline] Support for running as a default specseg-rubygems-mergerSamuel Giddins2016-06-211-2/+5
| | | |
| * | | Change Rakefile to work as a submoduleSamuel Giddins2016-06-212-9/+19
|/ / /
* | | Auto merge of #4692 - bundler:seg-fix-trampoline-specs, r=segiddinsHomu2016-06-211-1/+1
|\ \ \ | | | | | | | | | | | | Fix hardcoded bundler version string in trampoline specs
| * | | Fix hardcoded bundler version string in trampoline specsSamuel Giddins2016-06-201-1/+1
|/ / /
View Lorry Controller Status