[DRE-commits] [gitlab] 06/07: refresh patches
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Fri Jan 29 17:57:09 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 e588efcd23db7ee6d189af48b37b5d7642bcca71
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Fri Jan 29 23:10:24 2016 +0530
refresh patches
---
debian/patches/0002-loosen-devise.patch | 2 +-
debian/patches/0100-remove-development-test.patch | 9 ++++++---
debian/patches/0102-loosen-octokit.patch | 4 ++--
debian/patches/0300-no-hard-coded-workhorse-path.patch | 15 ---------------
debian/patches/series | 1 -
5 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/debian/patches/0002-loosen-devise.patch b/debian/patches/0002-loosen-devise.patch
index 2d3c21d..c60fbd0 100644
--- a/debian/patches/0002-loosen-devise.patch
+++ b/debian/patches/0002-loosen-devise.patch
@@ -8,7 +8,7 @@ Index: gitlab/Gemfile
gem "pg", '~> 0.18.2', group: :postgres
# Authentication libraries
--gem 'devise', '~> 3.5.3'
+-gem 'devise', '~> 3.5.4'
+gem 'devise', '~> 3.5.2'
gem 'devise-async', '~> 0.9.0'
gem 'doorkeeper', '~> 2.2.0'
diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch
index c82df55..4ced0ee 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,84 +220,6 @@ group :metrics do
+@@ -220,87 +220,11 @@ group :metrics do
gem 'connection_pool', '~> 2.0', require: false
end
@@ -79,10 +79,13 @@ Index: gitlab/Gemfile
- gem 'sham_rack'
-end
-
--group :production do
+ group :production do
- gem "gitlab_meta", '7.0'
--end
-
+ # Sentry integration
+ gem 'sentry-raven'
+ end
+
-gem "newrelic_rpm", '~> 3.9.4.245'
-gem 'newrelic-grape'
-
diff --git a/debian/patches/0102-loosen-octokit.patch b/debian/patches/0102-loosen-octokit.patch
index 176c258..fc39039 100644
--- a/debian/patches/0102-loosen-octokit.patch
+++ b/debian/patches/0102-loosen-octokit.patch
@@ -4,8 +4,8 @@ Index: gitlab/Gemfile
===================================================================
--- gitlab.orig/Gemfile
+++ gitlab/Gemfile
-@@ -220,7 +220,7 @@ group :metrics do
- gem 'connection_pool', '~> 2.0', require: false
+@@ -225,7 +225,7 @@ group :production do
+ gem 'sentry-raven'
end
-gem 'octokit', '~> 3.7.0'
diff --git a/debian/patches/0300-no-hard-coded-workhorse-path.patch b/debian/patches/0300-no-hard-coded-workhorse-path.patch
deleted file mode 100644
index 4a608be..0000000
--- a/debian/patches/0300-no-hard-coded-workhorse-path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-run from PATH
-
-Index: gitlab/lib/support/init.d/gitlab
-===================================================================
---- gitlab.orig/lib/support/init.d/gitlab
-+++ gitlab/lib/support/init.d/gitlab
-@@ -238,7 +238,7 @@ start_gitlab() {
- else
- # No need to remove a socket, gitlab-workhorse does this itself
- $app_root/bin/daemon_with_pidfile $gitlab_workhorse_pid_path \
-- $app_root/../gitlab-workhorse/gitlab-workhorse \
-+ gitlab-workhorse \
- $gitlab_workhorse_options \
- >> $gitlab_workhorse_log 2>&1 &
- fi
diff --git a/debian/patches/series b/debian/patches/series
index f37adbb..42280f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,4 +14,3 @@ loosen-rails-version.patch
0107-relax-omniauth-facebook.patch
0108-make-mysql-optional.patch
source-init-functions.patch
-0300-no-hard-coded-workhorse-path.patch
--
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