[DRE-commits] [gitlab] 04/17: 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 673f0f5a8eb6c4407ce8a42785abf246ad612255
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Feb 5 20:36:43 2016 +0530

    refresh patches
---
 debian/changelog                                  |  1 +
 debian/patches/0020-loosen-unicorn.patch          |  2 +-
 debian/patches/0028-loosen-ace-rails-ap.patch     |  2 +-
 debian/patches/0037-loosen-request-store.patch    |  2 +-
 debian/patches/0038-relax-net-ssh.patch           |  2 +-
 debian/patches/0100-remove-development-test.patch |  2 +-
 debian/patches/0102-loosen-octokit.patch          |  2 +-
 debian/patches/loosen-rails-version.patch         | 14 --------------
 debian/patches/series                             |  1 -
 9 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cd3a7c1..0d56ce2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gitlab (8.4.3+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release
+  * Refresh patches (rails version is in sync)
 
  -- Pirate Praveen <praveen at debian.org>  Fri, 05 Feb 2016 20:31:30 +0530
 
diff --git a/debian/patches/0020-loosen-unicorn.patch b/debian/patches/0020-loosen-unicorn.patch
index cf6ef9e..dbf531e 100644
--- a/debian/patches/0020-loosen-unicorn.patch
+++ b/debian/patches/0020-loosen-unicorn.patch
@@ -4,7 +4,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -110,7 +110,7 @@ gem 'diffy', '~> 3.0.3'
+@@ -111,7 +111,7 @@ gem 'diffy', '~> 3.0.3'
  
  # Application server
  group :unicorn do
diff --git a/debian/patches/0028-loosen-ace-rails-ap.patch b/debian/patches/0028-loosen-ace-rails-ap.patch
index af4ec55..4a759f6 100644
--- a/debian/patches/0028-loosen-ace-rails-ap.patch
+++ b/debian/patches/0028-loosen-ace-rails-ap.patch
@@ -4,7 +4,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -182,7 +182,7 @@ gem 'babosa', '~> 1.0.2'
+@@ -183,7 +183,7 @@ gem 'babosa', '~> 1.0.2'
  gem "rack-attack", '~> 4.3.1'
  
  # Ace editor
diff --git a/debian/patches/0037-loosen-request-store.patch b/debian/patches/0037-loosen-request-store.patch
index b7daace..856fe89 100644
--- a/debian/patches/0037-loosen-request-store.patch
+++ b/debian/patches/0037-loosen-request-store.patch
@@ -4,7 +4,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -207,7 +207,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3'
+@@ -208,7 +208,7 @@ gem 'jquery-scrollto-rails', '~> 1.4.3'
  gem 'jquery-ui-rails',    '~> 5.0.0'
  gem 'nprogress-rails',    '~> 0.1.6.7'
  gem 'raphael-rails',      '~> 2.1.2'
diff --git a/debian/patches/0038-relax-net-ssh.patch b/debian/patches/0038-relax-net-ssh.patch
index c7c7c9e..ca95d82 100644
--- a/debian/patches/0038-relax-net-ssh.patch
+++ b/debian/patches/0038-relax-net-ssh.patch
@@ -2,7 +2,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -210,7 +210,7 @@ gem 'raphael-rails',      '~> 2.1.2'
+@@ -211,7 +211,7 @@ gem 'raphael-rails',      '~> 2.1.2'
  gem 'request_store',      '~> 1.1'
  gem 'select2-rails',      '~> 3.5.9'
  gem 'virtus',             '~> 1.0.1'
diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch
index 4ced0ee..b3586df 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
-@@ -220,87 +220,11 @@ group :metrics do
+@@ -221,87 +221,11 @@ group :metrics do
    gem 'connection_pool', '~> 2.0', require: false
  end
  
diff --git a/debian/patches/0102-loosen-octokit.patch b/debian/patches/0102-loosen-octokit.patch
index fc39039..87627b0 100644
--- a/debian/patches/0102-loosen-octokit.patch
+++ b/debian/patches/0102-loosen-octokit.patch
@@ -4,7 +4,7 @@ Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
 +++ gitlab/Gemfile
-@@ -225,7 +225,7 @@ group :production do
+@@ -226,7 +226,7 @@ group :production do
    gem 'sentry-raven'
  end
  
diff --git a/debian/patches/loosen-rails-version.patch b/debian/patches/loosen-rails-version.patch
deleted file mode 100644
index 5a0d9ce..0000000
--- a/debian/patches/loosen-rails-version.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Forwarded: https://gitlab.com/gitlab-org/gitlab-ce/issues/2694
-
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -1,6 +1,6 @@
- source "https://rubygems.org"
- 
--gem 'rails', '4.2.4'
-+gem 'rails', '~> 4.2.4'
- gem 'rails-deprecated_sanitizer', '~> 1.0.3'
- 
- # Responders respond_to and respond_with
diff --git a/debian/patches/series b/debian/patches/series
index a133913..fa3f064 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-loosen-rails-version.patch
 0002-loosen-devise.patch
 003-loosen-sprockets.patch
 0005-use-debian-omniauth-ldap.patch

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