Embed doorkeeper

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' ]

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

debian/patches/0780-embed-doorkeeper.patch

@@ -0,0 +1,16 @@
+Description: This patch embeds doorkeeper.
+Author: Utkarsh Gupta <utkarsh@debian.org>
+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'

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

debian/upstream-file-list

@@ -71,6 +71,7 @@ docker-compose.yml
 elasticsearch-model
 elasticsearch-rails
 faraday-middleware-aws-signers-v4
+doorkeeper
 fixtures
 generator_templates
 haml_lint

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