Embed doorkeeper

This commit is contained in:
Utkarsh Gupta 2020-01-04 01:44:35 +05:30
parent e9b8ed4427
commit 01d2d8b829
7 changed files with 24 additions and 2 deletions

2
debian/control vendored
View file

@ -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~),

2
debian/gbp.conf vendored
View file

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

View file

@ -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

View file

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

View file

@ -32,3 +32,4 @@
0750-fix-relative-paths.patch
0760-bump-rubyzip.patch
0770-bump-node-d3.patch
0780-embed-doorkeeper.patch

View file

@ -68,6 +68,7 @@ derailed-benchmarks
doc
docker
docker-compose.yml
doorkeeper
elasticsearch-model
elasticsearch-rails
faraday-middleware-aws-signers-v4

3
debian/watch vendored
View file

@ -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