[DRE-commits] [gitlab] 02/04: Merge branch 'master-9.2'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository gitlab.

commit 24f7fe97bd81385f227e8b4b7d352e82c61a306c
Merge: 0a9133a 28a5621
Author: Pirate Praveen <praveen at debian.org>
Date:   Sun Sep 10 17:38:17 2017 +0530

    Merge branch 'master-9.2'

 debian/changelog                                   |   8 +
 debian/control                                     |  92 +++--
 debian/gitlab.links                                |   1 +
 debian/install                                     |   6 +
 debian/patches/0005-use-debian-omniauth-ldap.patch |   8 +-
 debian/patches/0018-loosen-rdoc.patch              |  13 -
 debian/patches/0050-relax-stable-libs.patch        | 300 +++++++-------
 debian/patches/0100-remove-development-test.patch  | 102 ++---
 debian/patches/0108-make-mysql-optional.patch      |  12 +-
 .../0110-make-test-dependencies-conditional.patch  |  12 +
 debian/patches/0210-use-jquery-ui-rails6.patch     |  41 --
 debian/patches/0220-relax-dependencies.patch       |  31 +-
 debian/patches/0230-relax-rugged.patch             |  20 +
 debian/patches/0240-relax-google-api-client.patch  |  11 +
 debian/patches/0250-relax-licensee.patch           |  11 +
 debian/patches/0260-relax-ruby-parser.patch        |  11 +
 debian/patches/0270-relax-toml-rb.patch            |   8 +
 debian/patches/0280-relax-pg.patch                 |  11 +
 debian/patches/0300-git-2-11-support.patch         | 438 ---------------------
 debian/patches/0400-use-npm-webpack.patch          |  13 +
 debian/patches/0410-set-webpack-root.patch         |  11 +
 debian/patches/0420-use-system-libs.patch          |  55 +++
 debian/patches/052-relax-grape.patch               |  13 -
 .../patches/add-system-lib-path-for-webpack.patch  |  10 +
 debian/patches/cve-2016-9086-fix.patch             |  47 ---
 debian/patches/cve-2017-0882.patch                 |  26 --
 debian/patches/series                              |  17 +-
 debian/rake-tasks.sh                               |   8 +
 debian/rules                                       |   2 -
 29 files changed, 494 insertions(+), 844 deletions(-)

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