[DRE-commits] [bundler] 01/02: Merge tag 'upstream/1.10.3'

[zeha at debian.org]

This is an automated email from the git hooks/post-receive script.

zeha pushed a commit to branch master
in repository bundler.

commit 18f842fd5e01e2ad980042849539c18820f2270a
Merge: a22a884 b209ec6
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Sat Jun 13 20:49:06 2015 +0200

    Merge tag 'upstream/1.10.3'
    
    Upstream version 1.10.3

 .travis.yml                                        |   6 +-
 CHANGELOG.md                                       |  84 +++++
 CODE_OF_CONDUCT.md                                 |   2 +-
 Rakefile                                           |  34 +-
 UPGRADING.md                                       | 103 ------
 bin/bundle_ruby                                    |   2 +
 bin/bundler                                        |   2 +-
 bundler.gemspec                                    |   2 +-
 lib/bundler.rb                                     |  35 +-
 lib/bundler/anonymizable_uri.rb                    |  32 --
 lib/bundler/cli.rb                                 |  23 +-
 lib/bundler/cli/config.rb                          |  27 +-
 lib/bundler/cli/exec.rb                            |   6 +
 lib/bundler/cli/gem.rb                             |   8 +-
 lib/bundler/cli/install.rb                         |  43 ++-
 lib/bundler/cli/lock.rb                            |  36 +++
 lib/bundler/cli/outdated.rb                        |  11 +-
 lib/bundler/definition.rb                          |  50 ++-
 lib/bundler/dependency.rb                          |  13 +-
 lib/bundler/deployment.rb                          |   3 +
 lib/bundler/dsl.rb                                 | 222 ++++++++++---
 lib/bundler/endpoint_specification.rb              |  21 +-
 lib/bundler/fetcher.rb                             | 359 ++++++---------------
 lib/bundler/fetcher/base.rb                        |  27 ++
 lib/bundler/fetcher/dependency.rb                  |  88 +++++
 lib/bundler/fetcher/downloader.rb                  |  61 ++++
 lib/bundler/fetcher/index.rb                       |  31 ++
 lib/bundler/friendly_errors.rb                     |   3 +
 lib/bundler/graph.rb                               |   3 +
 lib/bundler/inline.rb                              |  58 ++++
 lib/bundler/installer.rb                           |  75 +----
 lib/bundler/installer/parallel_installer.rb        | 117 +++++++
 lib/bundler/lazy_specification.rb                  |   2 +-
 lib/bundler/lockfile_parser.rb                     |  30 +-
 lib/bundler/man/bundle                             |  10 +-
 lib/bundler/man/bundle-config                      |   6 +
 lib/bundler/man/bundle-config.txt                  | 117 +++----
 lib/bundler/man/bundle-exec                        |   2 +-
 lib/bundler/man/bundle-exec.txt                    |   2 +-
 lib/bundler/man/bundle-install                     |  33 +-
 lib/bundler/man/bundle-install.txt                 | 110 +++----
 lib/bundler/man/bundle-platform                    |   2 +-
 lib/bundler/man/bundle-platform.txt                |   2 +-
 lib/bundler/man/bundle.txt                         |   7 +-
 lib/bundler/man/gemfile.5                          |   7 +-
 lib/bundler/man/gemfile.5.txt                      |  21 +-
 lib/bundler/remote_specification.rb                |   2 +-
 lib/bundler/resolver.rb                            |  23 +-
 lib/bundler/retry.rb                               |  21 +-
 lib/bundler/rubygems_ext.rb                        |   2 +-
 lib/bundler/rubygems_integration.rb                |  80 ++++-
 lib/bundler/settings.rb                            |  64 +++-
 lib/bundler/setup.rb                               |   2 +
 lib/bundler/shared_helpers.rb                      |   9 +-
 lib/bundler/source.rb                              |  10 -
 lib/bundler/source/git.rb                          |   4 +-
 lib/bundler/source/path.rb                         |   8 +-
 lib/bundler/source/path/installer.rb               |   4 +-
 lib/bundler/source/rubygems.rb                     |  60 +++-
 lib/bundler/source/rubygems/remote.rb              |  39 +++
 lib/bundler/stub_specification.rb                  |  23 ++
 lib/bundler/templates/newgem/.travis.yml.tt        |   1 +
 lib/bundler/templates/newgem/CODE_OF_CONDUCT.md.tt |   4 +-
 lib/bundler/templates/newgem/README.md.tt          |  16 +-
 lib/bundler/templates/newgem/Rakefile.tt           |   2 +
 .../test/{test_newgem.rb.tt => newgem_test.rb.tt}  |   4 +-
 .../{minitest_helper.rb.tt => test_helper.rb.tt}   |   0
 lib/bundler/ui/shell.rb                            |   2 +
 lib/bundler/version.rb                             |   2 +-
 man/bundle-config.ronn                             |   7 +
 man/bundle-install.ronn                            |   9 +
 man/bundle.ronn                                    |   6 +-
 man/gemfile.5.ronn                                 |  14 +-
 metadata.yml                                       |  50 +--
 74 files changed, 1567 insertions(+), 839 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/bundler.git