[DRE-commits] [gitlab] 08/09: refresh patches

[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 0531015a2bbfb201ea83d6b0fe4c0437c9008552
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Sep 25 12:17:16 2015 +0530

    refresh patches
---
 debian/patches/0002-loosen-devise.patch            | 12 ++++++------
 debian/patches/0003-loosen-doorkeeper.patch        | 10 +++++-----
 debian/patches/0004-loosen-rack-oauth2.patch       |  6 +++---
 debian/patches/0005-use-debian-omniauth-ldap.patch |  5 ++---
 debian/patches/0006-loosen-grape.patch             |  4 ++--
 debian/patches/loosen-rails-version.patch          |  7 ++++---
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/debian/patches/0002-loosen-devise.patch b/debian/patches/0002-loosen-devise.patch
index ea84564..8fbf152 100644
--- a/debian/patches/0002-loosen-devise.patch
+++ b/debian/patches/0002-loosen-devise.patch
@@ -4,12 +4,12 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -14,7 +14,7 @@ gem "mysql2", group: :mysql
- gem "pg", group: :postgres
+@@ -22,7 +22,7 @@ gem "mysql2", '~> 0.3.16', group: :mysql
+ gem "pg", '~> 0.18.2', group: :postgres
  
  # Authentication libraries
--gem "devise", '3.2.4'
-+gem "devise", '~> 3.2'
- gem "devise-async", '0.9.0'
+-gem "devise", '~> 3.5.2'
++gem "devise", '~> 3.5.1'
+ gem "devise-async", '~> 0.9.0'
  gem 'omniauth', "~> 1.2.2"
- gem 'omniauth-google-oauth2'
+ gem 'omniauth-google-oauth2', '~> 0.2.5'
diff --git a/debian/patches/0003-loosen-doorkeeper.patch b/debian/patches/0003-loosen-doorkeeper.patch
index 617d5ae..936dfca 100644
--- a/debian/patches/0003-loosen-doorkeeper.patch
+++ b/debian/patches/0003-loosen-doorkeeper.patch
@@ -2,12 +2,12 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -25,7 +25,7 @@ gem 'omniauth-kerberos', group: :kerbero
- gem 'omniauth-gitlab'
- gem 'omniauth-bitbucket'
+@@ -33,7 +33,7 @@ gem 'omniauth-kerberos', '~> 0.2.0', gro
+ gem 'omniauth-gitlab', '~> 1.0.0'
+ gem 'omniauth-bitbucket', '~> 0.0.2'
  gem 'omniauth-saml', '~> 1.4.0'
--gem 'doorkeeper', '2.1.3'
+-gem 'doorkeeper', '~> 2.1.3'
 +gem 'doorkeeper', '~> 2.1'
+ gem 'omniauth_crowd'
  gem "rack-oauth2", "~> 1.0.5"
  
- # Two-factor authentication
diff --git a/debian/patches/0004-loosen-rack-oauth2.patch b/debian/patches/0004-loosen-rack-oauth2.patch
index 93a06fc..b1d7e04 100644
--- a/debian/patches/0004-loosen-rack-oauth2.patch
+++ b/debian/patches/0004-loosen-rack-oauth2.patch
@@ -2,12 +2,12 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -26,7 +26,7 @@ gem 'omniauth-gitlab'
- gem 'omniauth-bitbucket'
+@@ -35,7 +35,7 @@ gem 'omniauth-bitbucket', '~> 0.0.2'
  gem 'omniauth-saml', '~> 1.4.0'
  gem 'doorkeeper', '~> 2.1'
+ gem 'omniauth_crowd'
 -gem "rack-oauth2", "~> 1.0.5"
 +gem "rack-oauth2", "~> 1.0"
  
  # Two-factor authentication
- gem 'devise-two-factor'
+ gem 'devise-two-factor', '~> 2.0.0'
diff --git a/debian/patches/0005-use-debian-omniauth-ldap.patch b/debian/patches/0005-use-debian-omniauth-ldap.patch
index 8dbc64d..8518ec0 100644
--- a/debian/patches/0005-use-debian-omniauth-ldap.patch
+++ b/debian/patches/0005-use-debian-omniauth-ldap.patch
@@ -2,12 +2,11 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -48,7 +48,8 @@ gem 'gitlab-grack', '~> 2.0.2', require:
+@@ -52,7 +52,7 @@ gem "gitlab_git", '~> 7.2.15'
  # LDAP Auth
  # GitLab fork with several improvements to original library. For full list of changes
  # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
--gem 'gitlab_omniauth-ldap', '1.2.1', require: "omniauth-ldap"
-+# Debian package ruby-omniauth-ldap already includes gitlab patches
+-gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap"
 +gem 'omniauth-ldap', '~> 1.0.4', require: "omniauth-ldap"
  
  # Git Wiki
diff --git a/debian/patches/0006-loosen-grape.patch b/debian/patches/0006-loosen-grape.patch
index 9ef4b66..20022d8 100644
--- a/debian/patches/0006-loosen-grape.patch
+++ b/debian/patches/0006-loosen-grape.patch
@@ -4,12 +4,12 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -62,7 +62,7 @@ gem 'gollum-lib', '~> 4.0.2'
+@@ -65,7 +65,7 @@ gem 'gollum-lib', '~> 4.0.2'
  gem "gitlab-linguist", "~> 3.0.1", require: "linguist"
  
  # API
 -gem "grape", "~> 0.6.1"
 +gem "grape", "~> 0.6"
  gem "grape-entity", "~> 0.4.2"
- gem 'rack-cors', require: 'rack/cors'
+ gem 'rack-cors', '~> 0.2.9', require: 'rack/cors'
  
diff --git a/debian/patches/loosen-rails-version.patch b/debian/patches/loosen-rails-version.patch
index 78cf302..bf45635 100644
--- a/debian/patches/loosen-rails-version.patch
+++ b/debian/patches/loosen-rails-version.patch
@@ -4,10 +4,11 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -1,6 +1,6 @@
- source "https://rubygems.org"
+@@ -8,7 +8,7 @@ def linux_only(require_as)
+   RUBY_PLATFORM.include?('linux') && require_as
+ end
  
--gem 'rails', '4.1.11'
+-gem 'rails', '4.1.12'
 +gem 'rails', '~> 4.2.4'
  
  # Specify a sprockets version due to security issue

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