From 9c9c70aabcbb37777fc5381957dd58ca164a1582 Mon Sep 17 00:00:00 2001 From: Sruthi Chandran Date: Mon, 9 Mar 2020 13:39:43 +0530 Subject: [PATCH] Remove embedded doorkeeper as it is available in experimental --- debian/control | 2 +- debian/gbp.conf | 2 +- debian/gitlab.install | 1 - debian/watch | 3 --- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/debian/control b/debian/control index 4e29286842..18d4adb831 100644 --- a/debian/control +++ b/debian/control @@ -50,7 +50,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby-marginalia (>= 1.8~), # Authentication libraries ruby-devise (>= 4.6.2~), -# ruby-doorkeeper (>= 4.3~), (embedded) + ruby-doorkeeper (>= 5~), ruby-doorkeeper-openid-connect (>= 1.5~), ruby-omniauth (>= 1.8~), ruby-omniauth-auth0 (>= 2.0~), diff --git a/debian/gbp.conf b/debian/gbp.conf index 9b0713c895..b9a4e519ee 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,2 +1,2 @@ [DEFAULT] -component = [ 'derailed-benchmarks', 'elasticsearch-model', 'elasticsearch-rails', 'faraday-middleware-aws-signers-v4', 'doorkeeper' ] +component = [ 'derailed-benchmarks', 'elasticsearch-model', 'elasticsearch-rails', 'faraday-middleware-aws-signers-v4' ] diff --git a/debian/gitlab.install b/debian/gitlab.install index fc31ab6fde..3b64ff3238 100644 --- a/debian/gitlab.install +++ b/debian/gitlab.install @@ -67,4 +67,3 @@ derailed-benchmarks usr/share/gitlab/vendor/gems elasticsearch-model usr/share/gitlab/vendor/gems elasticsearch-rails usr/share/gitlab/vendor/gems faraday-middleware-aws-signers-v4 usr/share/gitlab/vendor/gems -doorkeeper usr/share/gitlab/vendor/gems diff --git a/debian/watch b/debian/watch index 8d07197c05..eff7953880 100644 --- a/debian/watch +++ b/debian/watch @@ -16,6 +16,3 @@ https://gemwatch.debian.net/elasticsearch-rails.*/elasticsearch-rails-(6.1.*).ta opts="pgpmode=none,component=faraday-middleware-aws-signers-v4" \ https://gemwatch.debian.net/faraday_middleware-aws-signers-v4 .*/faraday_middleware-aws-signers-v4-(0.1.*).tar.gz ignore - -opts="pgpmode=none,component=doorkeeper" \ -https://gemwatch.debian.net/doorkeeper .*/doorkeeper-(5.0.*).tar.gz ignore