diff --git a/debian/control b/debian/control index d4731d98cd..e595e50497 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~), + # ruby-doorkeeper (>= 4.3~), (embedded) 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 7becee21c1..1970550ad1 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -1,2 +1,2 @@ [DEFAULT] -component = [ 'core-js', 'derailed-benchmarks', 'heapy', 'elasticsearch-model', 'elasticsearch-rails', 'faraday-middleware-aws-signers-v4' ] +component = [ 'core-js', 'derailed-benchmarks', 'heapy', 'elasticsearch-model', 'elasticsearch-rails', 'faraday-middleware-aws-signers-v4', 'doorkeeper' ] diff --git a/debian/gitlab.install b/debian/gitlab.install index abb8a51012..6f5e792930 100644 --- a/debian/gitlab.install +++ b/debian/gitlab.install @@ -69,3 +69,4 @@ heapy 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/patches/0780-embed-doorkeeper.patch b/debian/patches/0780-embed-doorkeeper.patch new file mode 100644 index 0000000000..af1c432d9d --- /dev/null +++ b/debian/patches/0780-embed-doorkeeper.patch @@ -0,0 +1,16 @@ +Description: This patch embeds doorkeeper. +Author: Utkarsh Gupta +Bug-Debian: https://bugs.debian.org/947754 +Last-Update: 2020-01-03 + +--- a/Gemfile ++++ b/Gemfile +@@ -26,7 +26,7 @@ + + # Authentication libraries + gem 'devise', '~> 4.6' +-gem 'doorkeeper', '~> 4.3' ++gem 'doorkeeper', '~> 4.3', path: 'vendor/gems/doorkeeper' + gem 'doorkeeper-openid_connect', '~> 1.5' + gem 'omniauth', '~> 1.8' + gem 'omniauth-auth0', '~> 2.0' diff --git a/debian/patches/series b/debian/patches/series index e1e209eda5..8e5eefd71c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -32,3 +32,4 @@ 0750-fix-relative-paths.patch 0760-bump-rubyzip.patch 0770-bump-node-d3.patch +0780-embed-doorkeeper.patch diff --git a/debian/upstream-file-list b/debian/upstream-file-list index 03644a5975..25e2b2f1ba 100644 --- a/debian/upstream-file-list +++ b/debian/upstream-file-list @@ -68,6 +68,7 @@ derailed-benchmarks doc docker docker-compose.yml +doorkeeper elasticsearch-model elasticsearch-rails faraday-middleware-aws-signers-v4 diff --git a/debian/watch b/debian/watch index ac45631694..cd1b5bbfdc 100644 --- a/debian/watch +++ b/debian/watch @@ -23,3 +23,6 @@ https://gemwatch.debian.net/elasticsearch-model .*/elasticsearch-rails-(0.1.*).t 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-(4.3.*).tar.gz ignore