[DRE-commits] [gitlab] 04/05: refresh patches

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master-8.4
in repository gitlab.

commit ca08fd48ccd55af8f206776df653ec04bafe32cb
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Jan 14 19:11:10 2016 +0530

    refresh patches
---
 debian/patches/0100-remove-development-test.patch | 10 +++++-----
 debian/patches/0102-loosen-octokit.patch          |  6 +++---
 debian/patches/0107-relax-omniauth-facebook.patch |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch
index 5289e46..8fdf0e6 100644
--- a/debian/patches/0100-remove-development-test.patch
+++ b/debian/patches/0100-remove-development-test.patch
@@ -2,13 +2,13 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -211,84 +211,6 @@ gem 'select2-rails',      '~> 3.5.9'
- gem 'virtus',             '~> 1.0.1'
- gem 'net-ssh',            '~> 3.0.1'
+@@ -220,84 +220,6 @@ group :metrics do
+   gem 'connection_pool', '~> 2.0', require: false
+ end
  
 -group :development do
 -  gem "foreman"
--  gem 'brakeman', '3.0.1', require: false
+-  gem 'brakeman', '~> 3.1.0', require: false
 -
 -  gem "annotate", "~> 2.6.0"
 -  gem "letter_opener", '~> 1.1.2'
@@ -33,7 +33,7 @@ Index: gitlab/Gemfile
 -  gem 'byebug', platform: :mri
 -  gem 'pry-rails'
 -
--  gem 'awesome_print', '~> 1.2.0'
+-  gem 'awesome_print', '~> 1.2.0', require: false
 -  gem 'fuubar', '~> 2.0.0'
 -
 -  gem 'database_cleaner', '~> 1.4.0'
diff --git a/debian/patches/0102-loosen-octokit.patch b/debian/patches/0102-loosen-octokit.patch
index 2855c21..b7b8a24 100644
--- a/debian/patches/0102-loosen-octokit.patch
+++ b/debian/patches/0102-loosen-octokit.patch
@@ -2,9 +2,9 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -211,7 +211,7 @@ gem 'select2-rails',      '~> 3.5.9'
- gem 'virtus',             '~> 1.0.1'
- gem 'net-ssh',            '~> 3.0.1'
+@@ -220,7 +220,7 @@ group :metrics do
+   gem 'connection_pool', '~> 2.0', require: false
+ end
  
 -gem 'octokit', '~> 3.7.0'
 +gem 'octokit', '~> 3.7'
diff --git a/debian/patches/0107-relax-omniauth-facebook.patch b/debian/patches/0107-relax-omniauth-facebook.patch
index 495755c..39d3649 100644
--- a/debian/patches/0107-relax-omniauth-facebook.patch
+++ b/debian/patches/0107-relax-omniauth-facebook.patch
@@ -2,10 +2,10 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -23,7 +23,7 @@ gem 'devise-async',           '~> 0.9.0'
- gem 'doorkeeper',             '~> 2.2.0'
- gem 'omniauth',               '~> 1.2.2'
+@@ -25,7 +25,7 @@ gem 'omniauth',               '~> 1.2.2'
+ gem 'omniauth-azure-oauth2',  '~> 0.0.6'
  gem 'omniauth-bitbucket',     '~> 0.0.2'
+ gem 'omniauth-cas3',          '~> 1.1.2'
 -gem 'omniauth-facebook',      '~> 3.0.0'
 +gem 'omniauth-facebook',      '~> 2.0.1'
  gem 'omniauth-github',        '~> 1.1.1'

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