[DRE-commits] [gitlab] 03/04: update dependencies

[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 3deed8f868a89efa4b64bbb2ae52926ac5eb63e2
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Jun 23 22:02:56 2016 +0530

    update dependencies
---
 debian/changelog                                  |  3 ++-
 debian/control                                    |  6 ++---
 debian/patches/0050-relax-stable-libs.patch       | 27 +++++++++--------------
 debian/patches/0100-remove-development-test.patch |  4 ++--
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 567841a..82483c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 gitlab (8.9.0+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Refresh patches and update dependencies 
 
- -- Pirate Praveen <praveen at debian.org>  Wed, 22 Jun 2016 15:31:28 +0530
+ -- Pirate Praveen <praveen at debian.org>  Thu, 23 Jun 2016 22:02:23 +0530
 
 gitlab (8.9.0+dfsg~rc4-1) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index 79d1516..75e6003 100644
--- a/debian/control
+++ b/debian/control
@@ -67,9 +67,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-attr-encrypted (>= 3.0~),
  ruby-u2f,
 # Browser detection
- ruby-browser (>= 2.0~),
+ ruby-browser (>= 2.2~),
 # Extracting information from a git repository
- ruby-gitlab-git (>= 10.0~),
+ ruby-gitlab-git (>= 10.2~),
 # LDAP Auth
 # Debian package includes gitlab patches
  ruby-omniauth-ldap (>= 1.0.4~),
@@ -207,7 +207,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  ruby-sentry-raven,
  ruby-premailer-rails,
  ruby-octokit (>= 4.3.0~),
- ruby-mail-room (>= 0.7~),
+ ruby-mail-room (>= 0.8~),
  ruby-email-reply-parser (>= 0.5.8~),
 ## CI
  ruby-activerecord-deprecated-finders (>= 1.0.3-2~),
diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch
index db62086..ba3da29 100644
--- a/debian/patches/0050-relax-stable-libs.patch
+++ b/debian/patches/0050-relax-stable-libs.patch
@@ -56,7 +56,7 @@ Index: gitlab/Gemfile
  gem 'jwt'
  
  # Spam and anti-bot protection
-@@ -42,13 +42,13 @@ gem 'recaptcha', '~> 3.0', require: 'rec
+@@ -42,9 +42,9 @@ gem 'recaptcha', '~> 3.0', require: 'rec
  gem 'akismet', '~> 2.0'
  
  # Two-factor authentication
@@ -68,11 +68,6 @@ Index: gitlab/Gemfile
  gem 'u2f', '~> 0.2.1'
  
  # Browser detection
--gem "browser", '~> 2.0.3'
-+gem "browser", '~> 2.0', '>= 2.0.3'
- 
- # Extracting information from a git repository
- # Provide access to Gitlab::Git library
 @@ -61,11 +61,11 @@ gem 'omniauth-ldap', '~> 1.0.4', require
  
  # Git Wiki
@@ -217,7 +212,7 @@ Index: gitlab/Gemfile
  
  # Detect and convert string character encoding
  gem 'charlock_holmes', '~> 0.7.3'
-@@ -213,31 +213,31 @@ gem 'charlock_holmes', '~> 0.7.3'
+@@ -213,30 +213,30 @@ gem 'charlock_holmes', '~> 0.7.3'
  # Parse duration
  gem 'chronic_duration', '~> 0.10.6'
  
@@ -226,23 +221,24 @@ Index: gitlab/Gemfile
 -gem "uglifier", '~> 2.7.2'
 -gem 'turbolinks', '~> 2.5.0'
 -gem 'jquery-turbolinks', '~> 2.1.0'
+-
+-gem 'addressable',        '~> 2.3.8'
+-gem 'bootstrap-sass',     '~> 3.3.0'
+-gem 'font-awesome-rails', '~> 4.6.1'
 +gem "sass-rails", '~> 5.0'
 +gem "coffee-rails", '~> 4.1'
 +gem "uglifier", '~> 2.7', '>= 2.7.2'
 +gem 'turbolinks', '~> 2.5'
 +gem 'jquery-turbolinks', '~> 2.1'
- 
--gem 'addressable',        '~> 2.3.8'
--gem 'bootstrap-sass',     '~> 3.3.0'
++
 +gem 'addressable',        '~> 2.3', '>= 2.3.8'
 +gem 'bootstrap-sass',     '~> 3.3'
- gem 'font-awesome-rails', '~> 4.2'
++gem 'font-awesome-rails', '~> 4.6', '>= 4.6.1'
  gem 'gitlab_emoji',       '~> 0.3.0'
 -gem 'gon',                '~> 6.0.1'
 -gem 'jquery-atwho-rails', '~> 1.3.2'
 -gem 'jquery-rails',       '~> 4.1.0'
 -gem 'jquery-ui-rails',    '~> 5.0.0'
--gem 'raphael-rails',      '~> 2.1.2'
 -gem 'request_store',      '~> 1.3.0'
 -gem 'select2-rails',      '~> 3.5.9'
 -gem 'virtus',             '~> 1.0.1'
@@ -251,7 +247,6 @@ Index: gitlab/Gemfile
 +gem 'jquery-atwho-rails', '~> 1.3', '>= 1.3.2'
 +gem 'jquery-rails',       '~> 4.0'
 +gem 'jquery-ui-rails',    '~> 5.0'
-+gem 'raphael-rails',      '~> 2.1', '>= 2.1.2'
 +gem 'request_store',      '~> 1.3'
 +gem 'select2-rails',      '~> 3.5', '>= 3.5.9'
 +gem 'virtus',             '~> 1.0', '>= 1.0.1'
@@ -266,16 +261,16 @@ Index: gitlab/Gemfile
  
  # Metrics
  group :metrics do
-@@ -329,7 +329,7 @@ end
+@@ -328,7 +328,7 @@ end
  
  gem "newrelic_rpm", '~> 3.14'
  
 -gem 'octokit', '~> 4.3.0'
 +gem 'octokit', '~> 4.3'
  
- gem "mail_room", "~> 0.7"
+ gem "mail_room", "~> 0.8"
  
-@@ -340,10 +340,10 @@ gem 'activerecord-session_store', '~> 1.
+@@ -339,10 +339,10 @@ gem 'activerecord-session_store', '~> 1.
  gem "nested_form", '~> 0.3.2'
  
  # OAuth
diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch
index 7635526..92833e3 100644
--- a/debian/patches/0100-remove-development-test.patch
+++ b/debian/patches/0100-remove-development-test.patch
@@ -4,7 +4,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -246,89 +246,6 @@ group :metrics do
+@@ -245,89 +245,6 @@ group :metrics do
    gem 'influxdb', '~> 0.2', require: false
  end
  
@@ -93,4 +93,4 @@ Index: gitlab/Gemfile
 -
  gem 'octokit', '~> 4.3'
  
- gem "mail_room", "~> 0.7"
+ gem "mail_room", "~> 0.8"

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