[DRE-commits] [gitlab] 04/06: tag patches

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Tue Jan 19 19:39:13 UTC 2016 

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

praveen pushed a commit to branch master
in repository gitlab.

commit 56d07ffb161aa365b4666924a40c10f40428c7c2
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Jan 20 00:51:50 2016 +0530

    tag patches
---
 debian/patches/0005-use-debian-omniauth-ldap.patch     |  2 ++
 debian/patches/0015-loosen-carrierwave.patch           |  2 ++
 debian/patches/0016-loosen-fog.patch                   |  2 ++
 debian/patches/0017-loosen-redcarpet.patch             | 13 -------------
 debian/patches/0018-loosen-rdoc.patch                  |  2 ++
 debian/patches/0020-loosen-unicorn.patch               |  2 ++
 debian/patches/0028-loosen-ace-rails-ap.patch          |  2 ++
 debian/patches/003-loosen-sprockets.patch              |  2 ++
 debian/patches/0037-loosen-request-store.patch         |  2 ++
 debian/patches/0100-remove-development-test.patch      |  2 ++
 debian/patches/0102-loosen-octokit.patch               |  2 ++
 debian/patches/0107-relax-omniauth-facebook.patch      |  4 ++++
 debian/patches/0300-no-hard-coded-workhorse-path.patch |  2 ++
 debian/patches/series                                  |  1 -
 debian/patches/source-init-functions.patch             |  2 ++
 15 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/debian/patches/0005-use-debian-omniauth-ldap.patch b/debian/patches/0005-use-debian-omniauth-ldap.patch
index ed67b3a..3ec98bc 100644
--- a/debian/patches/0005-use-debian-omniauth-ldap.patch
+++ b/debian/patches/0005-use-debian-omniauth-ldap.patch
@@ -1,3 +1,5 @@
+Debian package contains gitlab patches
+
 Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
diff --git a/debian/patches/0015-loosen-carrierwave.patch b/debian/patches/0015-loosen-carrierwave.patch
index f1ab435..9065cd1 100644
--- a/debian/patches/0015-loosen-carrierwave.patch
+++ b/debian/patches/0015-loosen-carrierwave.patch
@@ -1,3 +1,5 @@
+Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2805
+
 Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
diff --git a/debian/patches/0016-loosen-fog.patch b/debian/patches/0016-loosen-fog.patch
index 3e51c84..ce17015 100644
--- a/debian/patches/0016-loosen-fog.patch
+++ b/debian/patches/0016-loosen-fog.patch
@@ -1,3 +1,5 @@
+Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2807
+
 Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
diff --git a/debian/patches/0017-loosen-redcarpet.patch b/debian/patches/0017-loosen-redcarpet.patch
deleted file mode 100644
index 4a15d34..0000000
--- a/debian/patches/0017-loosen-redcarpet.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gitlab/Gemfile
-===================================================================
---- gitlab.orig/Gemfile
-+++ gitlab/Gemfile
-@@ -93,7 +93,7 @@ gem "seed-fu", '~> 2.3.5'
- gem 'html-pipeline', '~> 1.11.0'
- gem 'task_list',     '~> 1.0.2', require: 'task_list/railtie'
- gem 'github-markup', '~> 1.3.1'
--gem 'redcarpet',     '~> 3.3.3'
-+gem 'redcarpet',     '~> 3.3.2'
- gem 'RedCloth',      '~> 4.2.9'
- gem 'rdoc',          '~>3.6'
- gem 'org-ruby',      '~> 0.9.12'
diff --git a/debian/patches/0018-loosen-rdoc.patch b/debian/patches/0018-loosen-rdoc.patch
index 5985961..898b6e6 100644
--- a/debian/patches/0018-loosen-rdoc.patch
+++ b/debian/patches/0018-loosen-rdoc.patch
@@ -1,3 +1,5 @@
+Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2814
+
 Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
diff --git a/debian/patches/0020-loosen-unicorn.patch b/debian/patches/0020-loosen-unicorn.patch
index 27421f1..cf6ef9e 100644
--- a/debian/patches/0020-loosen-unicorn.patch
+++ b/debian/patches/0020-loosen-unicorn.patch
@@ -1,3 +1,5 @@
+Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2820
+
 Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
diff --git a/debian/patches/0028-loosen-ace-rails-ap.patch b/debian/patches/0028-loosen-ace-rails-ap.patch
index cc33f58..af4ec55 100644
--- a/debian/patches/0028-loosen-ace-rails-ap.patch
+++ b/debian/patches/0028-loosen-ace-rails-ap.patch
@@ -1,3 +1,5 @@
+Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2857
+
 Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
diff --git a/debian/patches/003-loosen-sprockets.patch b/debian/patches/003-loosen-sprockets.patch
index fa83588..0def2f5 100644
--- a/debian/patches/003-loosen-sprockets.patch
+++ b/debian/patches/003-loosen-sprockets.patch
@@ -1,3 +1,5 @@
+Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/6069
+
 Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
diff --git a/debian/patches/0037-loosen-request-store.patch b/debian/patches/0037-loosen-request-store.patch
index 1ce124d..b7daace 100644
--- a/debian/patches/0037-loosen-request-store.patch
+++ b/debian/patches/0037-loosen-request-store.patch
@@ -1,3 +1,5 @@
+Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2868
+
 Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch
index 8fdf0e6..c82df55 100644
--- a/debian/patches/0100-remove-development-test.patch
+++ b/debian/patches/0100-remove-development-test.patch
@@ -1,3 +1,5 @@
+Bundler will fail when it can't find these locally
+
 Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
diff --git a/debian/patches/0102-loosen-octokit.patch b/debian/patches/0102-loosen-octokit.patch
index b7b8a24..176c258 100644
--- a/debian/patches/0102-loosen-octokit.patch
+++ b/debian/patches/0102-loosen-octokit.patch
@@ -1,3 +1,5 @@
+Bug: https://gitlab.com/gitlab-org/gitlab-ce/issues/2877
+
 Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
diff --git a/debian/patches/0107-relax-omniauth-facebook.patch b/debian/patches/0107-relax-omniauth-facebook.patch
index 39d3649..ddd187c 100644
--- a/debian/patches/0107-relax-omniauth-facebook.patch
+++ b/debian/patches/0107-relax-omniauth-facebook.patch
@@ -1,3 +1,7 @@
+We can remove this patch when we update to 3.0
+.
+We were waiting to test diaspora with 3.0
+
 Index: gitlab/Gemfile
 ===================================================================
 --- gitlab.orig/Gemfile
diff --git a/debian/patches/0300-no-hard-coded-workhorse-path.patch b/debian/patches/0300-no-hard-coded-workhorse-path.patch
index 4e0c13d..4a608be 100644
--- a/debian/patches/0300-no-hard-coded-workhorse-path.patch
+++ b/debian/patches/0300-no-hard-coded-workhorse-path.patch
@@ -1,3 +1,5 @@
+run from PATH
+
 Index: gitlab/lib/support/init.d/gitlab
 ===================================================================
 --- gitlab.orig/lib/support/init.d/gitlab
diff --git a/debian/patches/series b/debian/patches/series
index b9c3be3..0ec067e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@ loosen-rails-version.patch
 0005-use-debian-omniauth-ldap.patch
 0015-loosen-carrierwave.patch
 0016-loosen-fog.patch
-0017-loosen-redcarpet.patch
 0018-loosen-rdoc.patch
 0020-loosen-unicorn.patch
 0028-loosen-ace-rails-ap.patch
diff --git a/debian/patches/source-init-functions.patch b/debian/patches/source-init-functions.patch
index bb4f65c..041a687 100644
--- a/debian/patches/source-init-functions.patch
+++ b/debian/patches/source-init-functions.patch
@@ -1,3 +1,5 @@
+To fix lintian warning
+
 Index: gitlab/lib/support/init.d/gitlab
 ===================================================================
 --- gitlab.orig/lib/support/init.d/gitlab

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

More information about the Pkg-ruby-extras-commits mailing list