Refresh patches again to relax all stable gems

debian/patches/0050-relax-stable-libs.patch

@@ -3,7 +3,7 @@ gitlab Gemfile
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -10,10 +10,10 @@ gem 'nakayoshi_fork', '~> 0.0.4'
+@@ -10,10 +10,10 @@
  # Responders respond_to and respond_with
  gem 'responders', '~> 3.0'
  
@@ -16,15 +16,24 @@ gitlab Gemfile
  
  # Supported DBs
  gem 'pg', '~> 1.1'
-@@ -29,25 +29,25 @@ gem 'devise', '~> 4.6'
+@@ -22,32 +22,32 @@
+ gem 'grape-path-helpers', '~> 1.1'
+ 
+ gem 'faraday', '~> 0.12'
+-gem 'marginalia', '~> 1.8.0'
++gem 'marginalia', '~> 1.8'
+ 
+ # Authentication libraries
+ gem 'devise', '~> 4.6'
  gem 'doorkeeper', '~> 4.3'
  gem 'doorkeeper-openid_connect', '~> 1.5'
  gem 'omniauth', '~> 1.8'
 -gem 'omniauth-auth0', '~> 2.0.0'
 +gem 'omniauth-auth0', '~> 2.0'
  gem 'omniauth-azure-oauth2', '~> 0.0.9'
- gem 'omniauth-cas3', '~> 1.1.4'
+-gem 'omniauth-cas3', '~> 1.1.4'
 -gem 'omniauth-facebook', '~> 4.0.0'
++gem 'omniauth-cas3', '~> 1.1', '>= 1.1.4'
 +gem 'omniauth-facebook', '~> 4.0'
  gem 'omniauth-github', '~> 1.3'
 -gem 'omniauth-gitlab', '~> 1.0.2'
@@ -50,16 +59,62 @@ gitlab Gemfile
  
  # Kerberos authentication. EE-only
  gem 'gssapi', group: :kerberos
-@@ -65,7 +65,7 @@ gem 'u2f', '~> 0.2.1'
+@@ -58,42 +58,42 @@
+ gem 'invisible_captcha', '~> 0.12.1'
+ 
+ # Two-factor authentication
+-gem 'devise-two-factor', '~> 3.0.0'
++gem 'devise-two-factor', '~> 3.0'
+ gem 'rqrcode-rails3', '~> 0.1.7'
+-gem 'attr_encrypted', '~> 3.1.0'
++gem 'attr_encrypted', '~> 3.1'
+ gem 'u2f', '~> 0.2.1'
  
  # GitLab Pages
- gem 'validates_hostname', '~> 1.0.6'
+-gem 'validates_hostname', '~> 1.0.6'
 -gem 'rubyzip', '~> 2.0.0', require: 'zip'
++gem 'validates_hostname', '~> 1.0', '>= 1.0.6'
 +gem 'rubyzip', '~> 2.0', require: 'zip'
  # GitLab Pages letsencrypt support
- gem 'acme-client', '~> 2.0.2'
+-gem 'acme-client', '~> 2.0.2'
++gem 'acme-client', '~> 2.0', '>= 2.0.2'
  
-@@ -102,7 +102,7 @@ gem 'hashie-forbidden_attributes'
+ # Browser detection
+ gem 'browser', '~> 2.5'
+ 
+ # GPG
+-gem 'gpgme', '~> 2.0.19'
++gem 'gpgme', '~> 2.0', '>= 2.0.19'
+ 
+ # LDAP Auth
+ # GitLab fork with several improvements to original library. For full list of changes
+ # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
+-gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
++gem 'gitlab_omniauth-ldap', '~> 2.1', '>= 2.1.1', require: 'omniauth-ldap'
+ gem 'net-ldap'
+ 
+ # API
+-gem 'grape', '~> 1.1.0'
++gem 'grape', '~> 1.1'
+ gem 'grape-entity', '~> 0.7.1'
+-gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
++gem 'rack-cors', '~> 1.0', require: 'rack/cors'
+ 
+ # GraphQL API
+-gem 'graphql', '~> 1.9.11'
++gem 'graphql', '~> 1.9', '>= 1.9.11'
+ # NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771
+ # TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released:
+ # https://gitlab.com/gitlab-org/gitlab/issues/31747
+-gem 'graphiql-rails', '~> 1.4.10'
++gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
+ gem 'apollo_upload_server', '~> 2.0.0.beta3'
+-gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
++gem 'graphql-docs', '~> 1.6', group: [:development, :test]
+ 
+ # Disable strong_params so that Mash does not respond to :permitted?
+ gem 'hashie-forbidden_attributes'
+@@ -102,7 +102,7 @@
  gem 'kaminari', '~> 1.0'
  
  # HAML
@@ -68,7 +123,7 @@ gitlab Gemfile
  
  # Files attachments
  gem 'carrierwave', '~> 1.3'
-@@ -112,7 +112,7 @@ gem 'mini_magick'
+@@ -112,7 +112,7 @@
  gem 'fog-aws', '~> 3.5'
  # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
  # Also see config/initializers/fog_core_patch.rb.
@@ -77,16 +132,68 @@ gitlab Gemfile
  gem 'fog-google', '~> 1.9'
  gem 'fog-local', '~> 0.6'
  gem 'fog-openstack', '~> 1.0'
-@@ -142,7 +142,7 @@ gem 'gitlab-markup', '~> 1.7.0'
+@@ -126,47 +126,47 @@
- gem 'github-markup', '~> 1.7.0', require: 'github/markup'
+ gem 'unf', '~> 0.1.4'
+ 
+ # Seed data
+-gem 'seed-fu', '~> 2.3.7'
++gem 'seed-fu', '~> 2.3', '>= 2.3.7'
+ 
+ # Search
+ gem 'elasticsearch-model', '~> 0.1.9'
+ gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation'
+-gem 'elasticsearch-api',   '5.0.3'
++gem 'elasticsearch-api',   '~> 5.0', '>= 5.0.3'
+ gem 'aws-sdk'
+ gem 'faraday_middleware-aws-signers-v4'
+ 
+ # Markdown and HTML processing
+ gem 'html-pipeline', '~> 2.12'
+ gem 'deckar01-task_list', '2.2.1'
+-gem 'gitlab-markup', '~> 1.7.0'
+-gem 'github-markup', '~> 1.7.0', require: 'github/markup'
++gem 'gitlab-markup', '~> 1.7'
++gem 'github-markup', '~> 1.7', require: 'github/markup'
  gem 'commonmarker', '~> 0.20'
- gem 'RedCloth', '~> 4.3.2'
+-gem 'RedCloth', '~> 4.3.2'
 -gem 'rdoc', '~> 6.1.2'
++gem 'RedCloth', '~> 4.3', '>= 4.3.2'
 +gem 'rdoc', '~> 6.1'
  gem 'org-ruby', '~> 0.9.12'
  gem 'creole', '~> 0.5.0'
  gem 'wikicloth', '0.8.1'
-@@ -183,13 +183,13 @@ gem 'state_machines-activerecord', '~> 0
+-gem 'asciidoctor', '~> 2.0.10'
++gem 'asciidoctor', '~> 2.0', '>= 2.0.10'
+ gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
+ gem 'asciidoctor-plantuml', '0.0.9'
+-gem 'rouge', '~> 3.11.0'
++gem 'rouge', '~> 3.11'
+ gem 'truncato', '~> 0.7.11'
+-gem 'bootstrap_form', '~> 4.2.0'
+-gem 'nokogiri', '~> 1.10.5'
++gem 'bootstrap_form', '~> 4.2'
++gem 'nokogiri', '~> 1.0', '>= 1.10.5'
+ gem 'escape_utils', '~> 1.1'
+ 
+ # Calendar rendering
+ gem 'icalendar'
+ 
+ # Diffs
+-gem 'diffy', '~> 3.1.0'
++gem 'diffy', '~> 3.1'
+ gem 'diff_match_patch', '~> 0.1.0'
+ 
+ # Application server
+-gem 'rack', '~> 2.0.7'
++gem 'rack', '~> 2.0', '>= 2.0.7'
+ 
+ group :unicorn do
+-  gem 'unicorn', '~> 5.4.1'
++  gem 'unicorn', '~> 5.4', '>= 5.4.1'
+   gem 'unicorn-worker-killer', '~> 0.4.4'
+ end
+ 
+@@ -183,13 +183,13 @@
  gem 'acts-as-taggable-on', '~> 6.0'
  
  # Background jobs
@@ -103,7 +210,7 @@ gitlab Gemfile
  
  # HTTP requests
  gem 'httparty', '~> 0.16.4'
-@@ -201,14 +201,14 @@ gem 'rainbow', '~> 3.0'
+@@ -201,14 +201,14 @@
  gem 'ruby-progressbar'
  
  # GitLab settings
@@ -121,7 +228,7 @@ gitlab Gemfile
  
  # Export Ruby Regex to Javascript
  gem 'js_regex', '~> 3.1'
-@@ -221,13 +221,13 @@ gem 'redis', '~> 4.0'
+@@ -221,13 +221,13 @@
  gem 'connection_pool', '~> 2.0'
  
  # Redis session store
@@ -137,7 +244,7 @@ gitlab Gemfile
  
  # Jira integration
  gem 'jira-ruby', '~> 1.7'
-@@ -237,7 +237,7 @@ gem 'atlassian-jwt', '~> 0.2.0'
+@@ -237,7 +237,7 @@
  gem 'flowdock', '~> 0.7'
  
  # Slack integration
@@ -146,7 +253,7 @@ gitlab Gemfile
  
  # Hangouts Chat integration
  gem 'hangouts-chat', '~> 0.0.5'
-@@ -249,11 +249,11 @@ gem 'asana', '~> 0.9'
+@@ -249,11 +249,11 @@
  gem 'ruby-fogbugz', '~> 0.2.1'
  
  # Kubernetes integration
@@ -160,7 +267,7 @@ gitlab Gemfile
  
  # Sanitizes SVG input
  gem 'loofah', '~> 2.2'
-@@ -262,7 +262,7 @@ gem 'loofah', '~> 2.2'
+@@ -262,7 +262,7 @@
  gem 'licensee', '~> 8.9'
  
  # Ace editor
@@ -169,21 +276,21 @@ gitlab Gemfile
  
  # Detect and convert string character encoding
  gem 'charlock_holmes', '~> 0.7.5'
-@@ -280,10 +280,10 @@ gem 'gitlab_chronic_duration', '~> 0.10.
+@@ -280,10 +280,10 @@
  gem 'webpack-rails', '~> 0.9.10'
  gem 'rack-proxy', '~> 0.6.0'
  
 -gem 'sassc-rails', '~> 2.1.0'
 -gem 'uglifier', '~> 2.7.2'
 +gem 'sassc-rails', '~> 2.1'
-+gem 'uglifier', '~> 2.7', '>=2.7.2'
++gem 'uglifier', '~> 2.7', '>= 2.7.2'
  
 -gem 'addressable', '~> 2.5.2'
-+gem 'addressable', '~> 2.5', '>=2.5.2'
++gem 'addressable', '~> 2.5', '>= 2.5.2'
  gem 'font-awesome-rails', '~> 4.7'
  gem 'gemojione', '~> 3.3'
  gem 'gon', '~> 6.2'
-@@ -293,12 +293,12 @@ gem 'base32', '~> 0.3.0'
+@@ -293,12 +293,12 @@
  gem "gitlab-license", "~> 1.0"
  
  # Protect against bruteforcing
@@ -198,7 +305,7 @@ gitlab Gemfile
  
  # LabKit: Tracing and Correlation
  gem 'gitlab-labkit', '~> 0.5'
-@@ -306,11 +306,11 @@ gem 'gitlab-labkit', '~> 0.5'
+@@ -306,11 +306,11 @@
  # I18n
  gem 'ruby_parser', '~> 3.8', require: false
  gem 'rails-i18n', '~> 5.1'
@@ -213,7 +320,7 @@ gitlab Gemfile
  
  # Perf bar
  gem 'peek', '~> 1.1'
-@@ -422,7 +422,7 @@ gem 'mail_room', '~> 0.10.0'
+@@ -422,7 +422,7 @@
  gem 'email_reply_trimmer', '~> 0.1'
  gem 'html2text'
  
@@ -222,7 +329,7 @@ gitlab Gemfile
  gem 'rbtrace', '~> 0.4', require: false
  gem 'memory_profiler', '~> 0.9', require: false
  gem 'benchmark-memory', '~> 0.1', require: false
-@@ -432,11 +432,11 @@ gem 'activerecord-explain-analyze', '~>
+@@ -432,11 +432,11 @@
  gem 'oauth2', '~> 1.4'
  
  # Health check
@@ -237,7 +344,7 @@ gitlab Gemfile
  
  # NTP client
  gem 'net-ntp'
-@@ -452,13 +452,13 @@ group :ed25519 do
+@@ -452,13 +452,13 @@
  end
  
  # Gitaly GRPC protocol definitions
@@ -255,7 +362,7 @@ gitlab Gemfile
  
  # Feature toggles
  gem 'flipper', '~> 0.17.1'
-@@ -476,4 +476,4 @@ gem 'gitlab-net-dns', '~> 0.9.1'
+@@ -476,4 +476,4 @@
  # Countries list
  gem 'countries', '~> 3.0'
  

debian/patches/0100-remove-development-test.patch

@@ -2,15 +2,15 @@ Bundler will fail when it can't find these locally
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -93,7 +93,6 @@ gem 'graphql', '~> 1.9.11'
+@@ -93,7 +93,6 @@
  # https://gitlab.com/gitlab-org/gitlab/issues/31747
- gem 'graphiql-rails', '~> 1.4.10'
+ gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
  gem 'apollo_upload_server', '~> 2.0.0.beta3'
--gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
+-gem 'graphql-docs', '~> 1.6', group: [:development, :test]
  
  # Disable strong_params so that Mash does not respond to :permitted?
  gem 'hashie-forbidden_attributes'
-@@ -308,7 +307,6 @@ gem 'ruby_parser', '~> 3.8', require: fa
+@@ -308,7 +307,6 @@
  gem 'rails-i18n', '~> 5.1'
  gem 'gettext_i18n_rails', '~> 1.8'
  gem 'gettext_i18n_rails_js', '~> 1.3'
@@ -18,7 +18,7 @@ Bundler will fail when it can't find these locally
  
  gem 'batch-loader', '~> 1.4'
  
-@@ -331,21 +329,6 @@ group :metrics do
+@@ -331,68 +329,6 @@
    gem 'raindrops', '~> 0.18'
  end
  
@@ -37,6 +37,53 @@ Bundler will fail when it can't find these locally
 -  gem 'thin', '~> 1.7.0'
 -end
 -
- group :development, :test do
+-group :development, :test do
-   gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
+-  gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
-   gem 'pry-byebug', '~> 3.5.1', platform: :mri
+-  gem 'pry-byebug', '~> 3.5.1', platform: :mri
+-  gem 'pry-rails', '~> 0.3.4'
+-
+-  gem 'awesome_print', require: false
+-
+-  gem 'database_cleaner', '~> 1.7.0'
+-  gem 'factory_bot_rails', '~> 5.1.0'
+-  gem 'rspec-rails', '~> 4.0.0.beta3'
+-
+-  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
+-  gem 'minitest', '~> 5.11.0'
+-
+-  # Generate Fake data
+-  gem 'ffaker', '~> 2.10'
+-
+-  gem 'spring', '~> 2.0.0'
+-  gem 'spring-commands-rspec', '~> 1.0.4'
+-
+-  gem 'gitlab-styles', '~> 2.7', require: false
+-  # Pin these dependencies, otherwise a new rule could break the CI pipelines
+-  gem 'rubocop', '~> 0.69.0'
+-  gem 'rubocop-performance', '~> 1.1.0'
+-  gem 'rubocop-rspec', '~> 1.22.1'
+-
+-  gem 'scss_lint', '~> 0.56.0', require: false
+-  gem 'haml_lint', '~> 0.34.0', require: false
+-  gem 'simplecov', '~> 0.16.1', require: false
+-  gem 'bundler-audit', '~> 0.5.0', require: false
+-
+-  gem 'benchmark-ips', '~> 2.3.0', require: false
+-
+-  gem 'knapsack', '~> 1.17'
+-
+-  gem 'stackprof', '~> 0.2.13', require: false
+-
+-  gem 'simple_po_parser', '~> 1.1.2', require: false
+-
+-  gem 'timecop', '~> 0.8.0'
+-end
+-
+-# Gems required in omnibus-gitlab pipeline
+-group :development, :test, :omnibus do
+-  gem 'license_finder', '~> 5.4', require: false
+-end
+-
+ group :test do
+   gem 'fuubar', '~> 2.2.0'
+   gem 'rspec-retry', '~> 0.6.1'

debian/patches/0110-make-test-dependencies-conditional.patch

@@ -4,23 +4,8 @@
    gem 'raindrops', '~> 0.18'
  end
  
--group :development, :test do
-+if ENV["INCLUDE_TEST_DEPENDS"] == "true"
-   gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
-   gem 'pry-byebug', '~> 3.5.1', platform: :mri
-   gem 'pry-rails', '~> 0.3.4'
-@@ -369,14 +369,10 @@
-   gem 'simple_po_parser', '~> 1.1.2', require: false
- 
-   gem 'timecop', '~> 0.8.0'
--end
- 
- # Gems required in omnibus-gitlab pipeline
--group :development, :test, :omnibus do
-   gem 'license_finder', '~> 5.4', require: false
--end
- 
 -group :test do
++if ENV["INCLUDE_TEST_DEPENDS"] == "true"
    gem 'fuubar', '~> 2.2.0'
    gem 'rspec-retry', '~> 0.6.1'
    gem 'rspec_profiling', '~> 0.0.5'

debian/patches/0430-remove-gitlab-markup.patch

@@ -1,10 +1,10 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -137,7 +137,6 @@ gem 'faraday_middleware-aws-signers-v4'
+@@ -137,7 +137,6 @@
  # Markdown and HTML processing
  gem 'html-pipeline', '~> 2.12'
  gem 'deckar01-task_list', '2.2.1'
--gem 'gitlab-markup', '~> 1.7.0'
+-gem 'gitlab-markup', '~> 1.7'
- gem 'github-markup', '~> 1.7.0', require: 'github/markup'
+ gem 'github-markup', '~> 1.7', require: 'github/markup'
  gem 'commonmarker', '~> 0.20'
- gem 'RedCloth', '~> 4.3.2'
+ gem 'RedCloth', '~> 4.3', '>= 4.3.2'

debian/patches/0450-remove-bullet.patch

@@ -1,10 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -323,7 +323,6 @@
- end
- 
- if ENV["INCLUDE_TEST_DEPENDS"] == "true"
--  gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
-   gem 'pry-byebug', '~> 3.5.1', platform: :mri
-   gem 'pry-rails', '~> 0.3.4'
- 

debian/patches/0480-embed-elasticsearch-model.patch

@@ -1,11 +1,11 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -128,7 +128,7 @@ gem 'unf', '~> 0.1.4'
+@@ -128,7 +128,7 @@
- gem 'seed-fu', '~> 2.3.7'
+ gem 'seed-fu', '~> 2.3', '>= 2.3.7'
  
  # Search
 -gem 'elasticsearch-model', '~> 0.1.9'
 +gem 'elasticsearch-model', '~> 0.1.9', path: 'vendor/gems/elasticsearch-model'
  gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation'
- gem 'elasticsearch-api',   '5.0.3'
+ gem 'elasticsearch-api',   '~> 5.0', '>= 5.0.3'
  gem 'aws-sdk'

debian/patches/0480-embed-elasticsearch-rails.patch

@@ -0,0 +1,11 @@
+--- a/Gemfile
++++ b/Gemfile
+@@ -129,7 +129,7 @@
+ 
+ # Search
+ gem 'elasticsearch-model', '~> 0.1.9', path: 'vendor/gems/elasticsearch-model'
+-gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation'
++gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails'
+ gem 'elasticsearch-api',   '~> 5.0', '>= 5.0.3'
+ gem 'aws-sdk'
+ gem 'faraday_middleware-aws-signers-v4'

debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch

@@ -1,13 +1,8 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -129,10 +129,10 @@
+@@ -132,7 +132,7 @@
- 
+ gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails'
- # Search
+ gem 'elasticsearch-api',   '~> 5.0', '>= 5.0.3'
- gem 'elasticsearch-model', '~> 0.1.9', path: 'vendor/gems/elasticsearch-model'
--gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation'
--gem 'elasticsearch-api',   '5.0.3'
-+gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails'
-+gem 'elasticsearch-api',   '~> 5.0', '>= 5.0.3'
  gem 'aws-sdk'
 -gem 'faraday_middleware-aws-signers-v4'
 +gem 'faraday_middleware-aws-signers-v4', path: 'vendor/gems/faraday-middleware-aws-signers-v4'

debian/patches/0484-relax-asciidoctor-plantuml.patch

@@ -10,18 +10,18 @@ Subject: [PATCH 1/2] Update asciidoctor-plantuml 0.0.9 -> 0.0.10
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -143,7 +143,7 @@ gem 'creole', '~> 0.5.0'
+@@ -143,7 +143,7 @@
  gem 'wikicloth', '0.8.1'
- gem 'asciidoctor', '~> 2.0.10'
+ gem 'asciidoctor', '~> 2.0', '>= 2.0.10'
  gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
 -gem 'asciidoctor-plantuml', '0.0.9'
 +gem 'asciidoctor-plantuml', '~> 0.0.10'
- gem 'rouge', '~> 3.11.0'
+ gem 'rouge', '~> 3.11'
  gem 'truncato', '~> 0.7.11'
- gem 'bootstrap_form', '~> 4.2.0'
+ gem 'bootstrap_form', '~> 4.2'
 --- a/Gemfile.lock
 +++ b/Gemfile.lock
-@@ -71,7 +71,7 @@ GEM
+@@ -71,7 +71,7 @@
      asciidoctor (2.0.10)
      asciidoctor-include-ext (0.3.1)
        asciidoctor (>= 1.5.6, < 3.0.0)
@@ -30,7 +30,7 @@ Subject: [PATCH 1/2] Update asciidoctor-plantuml 0.0.9 -> 0.0.10
        asciidoctor (>= 1.5.6, < 3.0.0)
      ast (2.4.0)
      atlassian-jwt (0.2.0)
-@@ -1126,7 +1126,7 @@ DEPENDENCIES
+@@ -1126,7 +1126,7 @@
    asana (~> 0.9)
    asciidoctor (~> 2.0.10)
    asciidoctor-include-ext (~> 0.3.1)

debian/patches/0486-relax-grpc-protobuf.patch

@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -421,9 +421,9 @@
+@@ -379,9 +379,9 @@
  # Gitaly GRPC protocol definitions
  gem 'gitaly', '~> 1.73'
  

debian/patches/0487-relax-rack-cors.patch

@@ -1,11 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -81,7 +81,7 @@
- # API
- gem 'grape', '~> 1.1.0'
- gem 'grape-entity', '~> 0.7.1'
--gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
-+gem 'rack-cors', '~> 1.0', require: 'rack/cors'
- 
- # GraphQL API
- gem 'graphql', '~> 1.9.11'

debian/patches/0488-relax-rdoc.patch

@@ -1,9 +1,9 @@
 --- a/Gemfile
 +++ b/Gemfile
 @@ -137,7 +137,7 @@
- gem 'github-markup', '~> 1.7.0', require: 'github/markup'
+ gem 'github-markup', '~> 1.7', require: 'github/markup'
  gem 'commonmarker', '~> 0.20'
- gem 'RedCloth', '~> 4.3.2'
+ gem 'RedCloth', '~> 4.3', '>= 4.3.2'
 -gem 'rdoc', '~> 6.1'
 +gem 'rdoc', '~> 6.0'
  gem 'org-ruby', '~> 0.9.12'

debian/patches/series

@@ -5,7 +5,6 @@
 #0400-Relax-recaptcha-version.patch
 0430-remove-gitlab-markup.patch
 0440-remove-puma.patch
-0450-remove-bullet.patch
 0460-embed-derailed-benchmarks.patch
 0470-relax-bootsnap.patch
 0480-embed-elasticsearch-model.patch
@@ -15,7 +14,6 @@
 0484-relax-asciidoctor-plantuml.patch
 0485-relax-responders.patch
 0486-relax-grpc-protobuf.patch
-0487-relax-rack-cors.patch
 0488-relax-rdoc.patch
 0500-set-webpack-root.patch
 0510-remove-dev-dependencies.patch