aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'v1.14.3'HEADmasterSamuel Giddins2017-01-242-1/+8
|\ | | | | | | Version 1.14.3
| * Version 1.14.3 with changelogSamuel Giddins2017-01-242-1/+8
| |
| * Auto merge of #5361 - bundler:seg-1-8-7-spec-install, r=segiddinsThe Bundler Bot2017-01-241-1/+2
| | | | | | | | | | | | Ensure rack is always installed first on 1.8.7 in the specs (cherry picked from commit d3c50f80d34d1ee7fa84d3d8a6a930c55186fbab)
| * Auto merge of #5355 - bundler:seg-resolver-restrict-platforms, r=indirectThe Bundler Bot2017-01-243-5/+26
| | | | | | | | | | | | | | | | | | | | [Resolver] Restrict activated platforms to those in the Gemfile This ensures that deps that come from the lockfile, which might only have the "ruby" platform, dont cause us to attempt to activate/resolve all "ruby" platform gems Closes #5349 (cherry picked from commit 6e69db334661fd31f559fb72463e7911b6f9c6a1)
| * Auto merge of #5354 - bundler:seg-gemspec-dev-deps-no-resolve, r=indirectThe Bundler Bot2017-01-242-1/+19
| | | | | | | | | | | | | | | | | | | | [Definition] Avoid re-resolving when a gemspec has dev deps Inspired by #5349. Since dev deps are added with `type: :development`, they are `!=` to the deps retrieved from the lockfile, which have no type. This compares the deps ignoring type completely (cherry picked from commit df20d19972f251ec4dec5cb7cba7e178f98df9e9)
* | Auto merge of #5361 - bundler:seg-1-8-7-spec-install, r=segiddinsThe Bundler Bot2017-01-241-1/+2
|\ \ | | | | | | | | | Ensure rack is always installed first on 1.8.7 in the specs
| * | Ensure rack is always installed first on 1.8.7 in the specsSamuel Giddins2017-01-241-1/+2
| | |
* | | Auto merge of #5355 - bundler:seg-resolver-restrict-platforms, r=indirectThe Bundler Bot2017-01-243-5/+26
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | [Resolver] Restrict activated platforms to those in the Gemfile This ensures that deps that come from the lockfile, which might only have the "ruby" platform, dont cause us to attempt to activate/resolve all "ruby" platform gems Closes #5349
| * | [Resolver] Restrict activated platforms to those in the GemfileSamuel Giddins2017-01-233-5/+26
| | | | | | | | | | | | This ensures that deps that come from the lockfile, which might only have the "ruby" platform, dont cause us to attempt to activate/resolve all "ruby" platform gems
* | | Auto merge of #5350 - feministy:docs-reorg, r=indirectThe Bundler Bot2017-01-2419-251/+466
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [docs] consolidate all docs into sub folder 👋 goodness, that was a lot of typing! this is the first step of many for #5026. the only section that isn't complete with these changes is `RELEASING.md`, which is in progress in #5252 (those changes will be moved into the proper location if this PR goes in first). i made a few minor tweaks to the project's README to support this organization. i also left the code of conduct in the root. ~~one thing i *am concerned about* is that our little "guidelines for contributing" warning message on PRs is going to disappear after this gets merged because `CONTRIBUTING.md` is no longer in the root~~ ~~should i put a file in the root called `CONTRIBUTING.md` that links to the docs for contributing? 🤔 i'm not 100% sure on how the github integration for that works so y'all let me know.~~
| * | :sparkles: quick start contribution guideLiz Abinante2017-01-232-1/+18
| | |
| * | first pass :dash: at breaking up documentation into good chunksLiz Abinante2017-01-2219-258/+456
| | |
* | | Merge pull request #5348 from feministy/clean-check-man-pagesliz!2017-01-239-2/+162
|\ \ \ | | | | | | | | create man pages for missing commands
| * | | :sparkles: change test to compare version instead of checkLiz Abinante2017-01-221-2/+2
| | | |
| * | | :tophat: add other missing commands to man pagesLiz Abinante2017-01-228-2/+118
| | | |
| * | | :sparkle: new pages for andLiz Abinante2017-01-223-0/+44
| | | |
* | | | Auto merge of #5354 - bundler:seg-gemspec-dev-deps-no-resolve, r=indirectThe Bundler Bot2017-01-242-1/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Definition] Avoid re-resolving when a gemspec has dev deps Inspired by #5349. Since dev deps are added with `type: :development`, they are `!=` to the deps retrieved from the lockfile, which have no type. This compares the deps ignoring type completely
| * | | | [Definition] Avoid re-resolving when a gemspec has dev depsSamuel Giddins2017-01-232-1/+19
|/ / / /
* | | | Merge tag 'v1.14.2'Samuel Giddins2017-01-222-1/+8
|\ \ \ \ | | |_|/ | |/| | | | | | Version 1.14.2
| * | | Version 1.14.2 with changelogSamuel Giddins2017-01-222-1/+8
| | | |
| * | | Auto merge of #5345 - bundler:seg-windows-force-ruby, r=indirectThe Bundler Bot2017-01-222-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CurrentRuby] Ensure the local platform isnt ruby before checking os/cpu Closes #5344 fixes the problem since `Bundler.local_platform` can now be `"ruby"` on Windows, instead of a full-blown `Gem::Platform` object, when `force_ruby_platform` is set (cherry picked from commit 8eb8a5d76b92fc285e4161d7fc6896f639e2d373)
| * | | Auto merge of #5343 - bundler:seg-converge-sources-first, r=indirectThe Bundler Bot2017-01-224-11/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Definition] Converge sources before anything else Fixes #5340 Improves handling of gemspec sources by ensuring they're converged before anything else, and also converging the locked dependency sources so that `dependencies_for_source_changed?` doesn't get tripped up - [x] test coverage (cherry picked from commit 3e5d59aeaa8d2ec828b485ac4ec3b43cc35de63a)
* | | | Auto merge of #5345 - bundler:seg-windows-force-ruby, r=indirectThe Bundler Bot2017-01-232-3/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CurrentRuby] Ensure the local platform isnt ruby before checking os/cpu Closes #5344 fixes the problem since `Bundler.local_platform` can now be `"ruby"` on Windows, instead of a full-blown `Gem::Platform` object, when `force_ruby_platform` is set
| * | | | [CurrentRuby] Ensure the local platform isnt ruby before checking os/cpuSamuel Giddins2017-01-212-3/+19
| | |_|/ | |/| |
* | | | Auto merge of #5343 - bundler:seg-converge-sources-first, r=indirectThe Bundler Bot2017-01-224-11/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Definition] Converge sources before anything else Fixes #5340 Improves handling of gemspec sources by ensuring they're converged before anything else, and also converging the locked dependency sources so that `dependencies_for_source_changed?` doesn't get tripped up - [x] test coverage
| * | | | [Definition] Switch path sources after checking them for changesSamuel Giddins2017-01-212-11/+13
| | | | |
| * | | | Add a spec for gemspec deps not requiring re-resolveSamuel Giddins2017-01-211-0/+14
| | | | |
| * | | | [Definition] Converge sources firstSamuel Giddins2017-01-211-1/+1
| | | | |
| * | | | [Definition] Also converge dep sources to Source::GemspecSamuel Giddins2017-01-211-0/+3
| | | | |
| * | | | [SpecInstallation] Add #to_sSamuel Giddins2017-01-211-0/+4
| |/ / /
* | | | Auto merge of #5251 - feministy:platform-pages-formatting, r=indirectThe Bundler Bot2017-01-221-62/+22
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clean up platform docs for versions closes https://github.com/bundler/bundler-site/issues/260 Per @lynnco's suggestion, this cleans up the formatting for platform version specifications. I added the platform list first, then specified the platforms that don't have versions, and then provided the full version list. I'm not sure how to check the formatting of man pages locally - if you let me know how to do this I can update `CONTRIBUTING` and add this to other guidelines 💯
| * | | clean up platform docs for versionsLiz Abinante2017-01-221-62/+22
|/ / /
* | | Merge tag 'v1.14.1'Samuel Giddins2017-01-212-1/+7
|\| | | | | | | | | | | Version 1.14.1
| * | Version 1.14.1 with changelogSamuel Giddins2017-01-212-1/+7
| | |
| * | Auto merge of #5342 - bundler:seg-ruby-2-2-2-bug, r=segiddinsThe Bundler Bot2017-01-211-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [SharedHelpers] Use block.call instead of yield to avoid a stack cons… …istency error on Ruby 2.2.2 Using `yield` would cause a crash in the ruby VM due to calls sharing state and leading to a count mismatch. Using block.call avoids that issue Fixes https://github.com/bundler/bundler/issues/5341 Manually tested on Ruby 2.2.2 and 2.2.3, since they're not in the test matrix (only the latest 2.2.x is) (cherry picked from commit e60c73554ddc6d5bd58b1967c0c4c4acf3a5c253)
| * | Auto merge of #5338 - bundler:seg-doc-settings, r=indirectThe Bundler Bot2017-01-213-22/+53
| | | | | | | | | | | | | | | | | | | | | | | | Document all Bundler settings Closes #5288 (cherry picked from commit 990f05e86593c0a821c538ae9cae535c298eee7a)
* | | Auto merge of #5342 - bundler:seg-ruby-2-2-2-bug, r=segiddinsThe Bundler Bot2017-01-211-2/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [SharedHelpers] Use block.call instead of yield to avoid a stack cons… …istency error on Ruby 2.2.2 Using `yield` would cause a crash in the ruby VM due to calls sharing state and leading to a count mismatch. Using block.call avoids that issue Fixes https://github.com/bundler/bundler/issues/5341 Manually tested on Ruby 2.2.2 and 2.2.3, since they're not in the test matrix (only the latest 2.2.x is)
| * | | [SharedHelpers] Use block.call instead of yield to avoid a stack consistency ↵Samuel Giddins2017-01-211-2/+4
|/ / / | | | | | | | | | | | | | | | | | | error on Ruby 2.2.2 Using `yield` would cause a crash in the ruby VM due to calls sharing state and leading to a count mismatch. Using block.call avoids that issue
* | | Auto merge of #5338 - bundler:seg-doc-settings, r=indirectThe Bundler Bot2017-01-213-22/+50
|\ \ \ | | | | | | | | | | | | | | | | | | | | Document all Bundler settings Closes #5288
| * | | Document all Bundler settingsSamuel Giddins2017-01-213-22/+50
|/ / /
* | | Merge tag 'v1.14.0'Samuel Giddins2017-01-202-3/+11
|\| | | | | | | | | | | Version 1.14.0
| * | Version 1.14.0 with changelogSamuel Giddins2017-01-202-1/+9
| | |
| * | Auto merge of #5329 - bundler:seg-settings-autoload, r=indirectThe Bundler Bot2017-01-202-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | [Settings] Autoload Mirror under Settings namespace Closes #5238 (cherry picked from commit 01d22f047102db76cfc987eec2ca6c3bcf1456e5)
| * | Auto merge of #5328 - bundler:seg-inline-empty-bundle-gemfile, r=indirectThe Bundler Bot2017-01-205-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | [Inline] Support running when BUNDLE_GEMFILE="" Closes #5079 (cherry picked from commit 4be855932695fc1fbff677687e7e54102982083d)
| * | Fix dates in CHANGELOG.mdchrismo2017-01-131-2/+2
| | |
* | | Auto merge of #5333 - bundler:seg-test-conditionals, r=segiddinsThe Bundler Bot2017-01-193-14/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | Use rubygems conditional for specs Also allows us to delete a rubocop todo
| * | | Use rubygems conditional for specsSamuel Giddins2017-01-183-14/+3
|/ / /
* | | Auto merge of #5329 - bundler:seg-settings-autoload, r=indirectThe Bundler Bot2017-01-172-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | [Settings] Autoload Mirror under Settings namespace Closes #5238
| * | | [Settings] Autoload Mirror under Settings namespaceSamuel Giddins2017-01-142-2/+3
| | | |
* | | | Auto merge of #5328 - bundler:seg-inline-empty-bundle-gemfile, r=indirectThe Bundler Bot2017-01-175-4/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [Inline] Support running when BUNDLE_GEMFILE="" Closes #5079
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-22 01:06:49 +0000