diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch
index 6db15f87b7..091e688bf0 100644
--- a/debian/patches/0050-relax-stable-libs.patch
+++ b/debian/patches/0050-relax-stable-libs.patch
@@ -17,7 +17,7 @@ gitlab Gemfile
  # Supported DBs
  gem 'pg', '~> 1.1'
 @@ -22,32 +22,32 @@
- gem 'grape-path-helpers', '~> 1.1'
+ gem 'grape-path-helpers', '~> 1.2'
  
  gem 'faraday', '~> 0.12'
 -gem 'marginalia', '~> 1.8.0'
@@ -25,8 +25,10 @@ gitlab Gemfile
  
  # Authentication libraries
  gem 'devise', '~> 4.6'
- gem 'doorkeeper', '~> 4.3'
- gem 'doorkeeper-openid_connect', '~> 1.5'
+-gem 'doorkeeper', '~> 5.0.2'
+-gem 'doorkeeper-openid_connect', '~> 1.6.3'
++gem 'doorkeeper', '~> 5.0', '>= 5.0.2'
++gem 'doorkeeper-openid_connect', '~> 1.6', '>= 1.6.3'
  gem 'omniauth', '~> 1.8'
 -gem 'omniauth-auth0', '~> 2.0.0'
 +gem 'omniauth-auth0', '~> 2.0'
@@ -35,7 +37,7 @@ gitlab Gemfile
 -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-github', '~> 1.4'
 -gem 'omniauth-gitlab', '~> 1.0.2'
 +gem 'omniauth-gitlab', '~> 1.0', '>= 1.0.2'
  gem 'omniauth-google-oauth2', '~> 0.6.0'
@@ -76,8 +78,8 @@ gitlab Gemfile
 +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.0.2'
+-gem 'acme-client', '~> 2.0.5'
++gem 'acme-client', '~> 2.0', '>= 2.0.5'
  
  # Browser detection
  gem 'browser', '~> 2.5'
@@ -97,12 +99,12 @@ gitlab Gemfile
 -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'
+-gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'
++gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors'
  
  # GraphQL API
--gem 'graphql', '~> 1.9.11'
-+gem 'graphql', '~> 1.9', '>= 1.9.11'
+-gem 'graphql', '~> 1.9.12'
++gem 'graphql', '~> 1.9', '>= 1.9.12'
  # 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
@@ -132,7 +134,7 @@ gitlab Gemfile
  gem 'fog-google', '~> 1.9'
  gem 'fog-local', '~> 0.6'
  gem 'fog-openstack', '~> 1.0'
-@@ -126,47 +126,47 @@
+@@ -126,7 +126,7 @@
  gem 'unf', '~> 0.1.4'
  
  # Seed data
@@ -140,16 +142,11 @@ gitlab Gemfile
 +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'
- 
+ gem 'elasticsearch-model', '~> 6.1'
+@@ -138,35 +138,35 @@
  # Markdown and HTML processing
  gem 'html-pipeline', '~> 2.12'
- gem 'deckar01-task_list', '2.2.1'
+ gem 'deckar01-task_list', '2.3.1'
 -gem 'gitlab-markup', '~> 1.7.0'
 -gem 'github-markup', '~> 1.7.0', require: 'github/markup'
 +gem 'gitlab-markup', '~> 1.7'
@@ -158,21 +155,21 @@ gitlab Gemfile
 -gem 'RedCloth', '~> 4.3.2'
 -gem 'rdoc', '~> 6.1.2'
 +gem 'RedCloth', '~> 4.3', '>= 4.3.2'
-+gem 'rdoc', '~> 6.1'
++gem 'rdoc', '~> 6.1', '>= 6.1.2'
  gem 'org-ruby', '~> 0.9.12'
  gem 'creole', '~> 0.5.0'
  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 'rouge', '~> 3.11.0'
-+gem 'rouge', '~> 3.11'
+ gem 'asciidoctor-plantuml', '0.0.10'
+-gem 'rouge', '~> 3.15.0'
++gem 'rouge', '~> 3.15'
  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 'nokogiri', '~> 1.10', '>= 1.10.5'
  gem 'escape_utils', '~> 1.1'
  
  # Calendar rendering
@@ -257,8 +254,8 @@ gitlab Gemfile
  gem 'ruby-fogbugz', '~> 0.2.1'
  
  # Kubernetes integration
--gem 'kubeclient', '~> 4.4.0'
-+gem 'kubeclient', '~> 4.4'
+-gem 'kubeclient', '~> 4.6.0'
++gem 'kubeclient', '~> 4.6'
  
  # Sanitize user input
  gem 'sanitize', '~> 4.6'
@@ -276,7 +273,7 @@ gitlab Gemfile
  
  # Detect and convert string character encoding
  gem 'charlock_holmes', '~> 0.7.5'
-@@ -280,10 +280,10 @@
+@@ -280,8 +280,8 @@
  gem 'webpack-rails', '~> 0.9.10'
  gem 'rack-proxy', '~> 0.6.0'
  
@@ -285,11 +282,8 @@ gitlab Gemfile
 +gem 'sassc-rails', '~> 2.1'
 +gem 'uglifier', '~> 2.7', '>= 2.7.2'
  
--gem 'addressable', '~> 2.5.2'
-+gem 'addressable', '~> 2.5', '>= 2.5.2'
+ gem 'addressable', '~> 2.7'
  gem 'font-awesome-rails', '~> 4.7'
- gem 'gemojione', '~> 3.3'
- gem 'gon', '~> 6.2'
 @@ -293,12 +293,12 @@
  gem "gitlab-license", "~> 1.0"
  
@@ -304,11 +298,11 @@ gitlab Gemfile
 +gem 'premailer-rails', '~> 1.10', '>= 1.10.3'
  
  # LabKit: Tracing and Correlation
- gem 'gitlab-labkit', '~> 0.5'
+ gem 'gitlab-labkit', '0.9.1'
 @@ -306,11 +306,11 @@
  # I18n
  gem 'ruby_parser', '~> 3.8', require: false
- gem 'rails-i18n', '~> 5.1'
+ gem 'rails-i18n', '~> 6.0'
 -gem 'gettext_i18n_rails', '~> 1.8.0'
 +gem 'gettext_i18n_rails', '~> 1.8'
  gem 'gettext_i18n_rails_js', '~> 1.3'
@@ -320,22 +314,20 @@ gitlab Gemfile
  
  # Perf bar
  gem 'peek', '~> 1.1'
-@@ -348,23 +348,23 @@
+@@ -348,40 +348,40 @@
  
  group :development, :test do
    gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
 -  gem 'pry-byebug', '~> 3.5.1', platform: :mri
-+  gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri
-   gem 'pry-rails', '~> 0.3.4'
++  gem 'pry-byebug', '~> 3.5', platform: :mri
+   gem 'pry-rails', '~> 0.3.9'
  
    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'
 +  gem 'database_cleaner', '~> 1.7'
-+  gem 'factory_bot_rails', '~> 5.1'
-+  gem 'rspec-rails', '>= 4.0.0.beta3', '< 5.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'
@@ -349,9 +341,17 @@ gitlab Gemfile
 +  gem 'spring', '~> 2.0'
 +  gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
  
-   gem 'gitlab-styles', '~> 2.7', require: false
+-  gem 'gitlab-styles', '~> 3.1.0', require: false
++  gem 'gitlab-styles', '~> 3.1', require: false
    # Pin these dependencies, otherwise a new rule could break the CI pipelines
-@@ -377,13 +377,13 @@
+   gem 'rubocop', '~> 0.74.0'
+-  gem 'rubocop-performance', '~> 1.4.1'
+-  gem 'rubocop-rspec', '~> 1.37.0'
++  gem 'rubocop-performance', '~> 1.4', '>= 1.4.1'
++  gem 'rubocop-rspec', '~> 1.37'
+ 
+   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
  
@@ -360,14 +360,12 @@ gitlab Gemfile
  
    gem 'knapsack', '~> 1.17'
  
-   gem 'stackprof', '~> 0.2.13', require: false
- 
 -  gem 'simple_po_parser', '~> 1.1.2', require: false
 +  gem 'simple_po_parser', '~> 1.1', '>= 1.1.2', require: false
  
    gem 'timecop', '~> 0.8.0'
- end
-@@ -394,20 +394,20 @@
+ 
+@@ -396,20 +396,20 @@
  end
  
  group :test do
@@ -380,14 +378,16 @@ gitlab Gemfile
  
 -  gem 'capybara', '~> 3.22.0'
 -  gem 'capybara-screenshot', '~> 1.0.22'
-+  gem 'capybara', '~> 3.22'
-+  gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
-   gem 'selenium-webdriver', '~> 3.142'
- 
+-  gem 'selenium-webdriver', '~> 3.142'
+-
 -  gem 'shoulda-matchers', '~> 4.0.1', require: false
 -  gem 'email_spec', '~> 2.2.0'
 -  gem 'json-schema', '~> 2.8.0'
 -  gem 'webmock', '~> 3.5.1'
++  gem 'capybara', '~> 3.22'
++  gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
++  gem 'selenium-webdriver', '~> 3.1', '>= 3.142'
++
 +  gem 'shoulda-matchers', '~> 4.0', '>= 4.0.1', require: false
 +  gem 'email_spec', '~> 2.2'
 +  gem 'json-schema', '~> 2.8'
@@ -395,16 +395,16 @@ gitlab Gemfile
    gem 'rails-controller-testing'
    gem 'concurrent-ruby', '~> 1.1'
    gem 'test-prof', '~> 0.10.0'
-@@ -422,7 +422,7 @@
+@@ -424,7 +424,7 @@
  gem 'email_reply_trimmer', '~> 0.1'
  gem 'html2text'
  
 -gem 'ruby-prof', '~> 1.0.0'
 +gem 'ruby-prof', '~> 1.0'
+ gem 'stackprof', '~> 0.2.15', require: false
  gem 'rbtrace', '~> 0.4', require: false
  gem 'memory_profiler', '~> 0.9', require: false
- gem 'benchmark-memory', '~> 0.1', require: false
-@@ -432,11 +432,11 @@
+@@ -435,11 +435,11 @@
  gem 'oauth2', '~> 1.4'
  
  # Health check
@@ -419,12 +419,12 @@ gitlab Gemfile
  
  # NTP client
  gem 'net-ntp'
-@@ -452,13 +452,13 @@
+@@ -455,13 +455,13 @@
  end
  
  # Gitaly GRPC protocol definitions
--gem 'gitaly', '~> 1.73.0'
-+gem 'gitaly', '~> 1.73'
+-gem 'gitaly', '~> 1.86.0'
++gem 'gitaly', '~> 1.86'
  
 -gem 'grpc', '~> 1.24.0'
 +gem 'grpc', '~> 1.24'
@@ -432,14 +432,25 @@ gitlab Gemfile
 -gem 'google-protobuf', '~> 3.8.0'
 +gem 'google-protobuf', '~> 3.8'
  
--gem 'toml-rb', '~> 1.0.0', require: false
-+gem 'toml-rb', '~> 1.0', require: false
+-gem 'toml-rb', '~> 1.0.0'
++gem 'toml-rb', '~> 1.0'
  
  # Feature toggles
  gem 'flipper', '~> 0.17.1'
-@@ -476,4 +476,4 @@
+@@ -479,14 +479,14 @@
  # Countries list
  gem 'countries', '~> 3.0'
  
 -gem 'retriable', '~> 3.1.2'
 +gem 'retriable', '~> 3.1', '>= 3.1.2'
+ 
+ gem 'liquid', '~> 4.0'
+ 
+ # LRU cache
+ gem 'lru_redux'
+ 
+-gem 'erubi', '~> 1.9.0'
++gem 'erubi', '~> 1.9'
+ 
+ # Locked as long as quoted-printable encoding issues are not resolved
+ # Monkey-patched in `config/initializers/mail_encoding_patch.rb`
diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch
index 8fc67a5bd2..66d0736a70 100644
--- a/debian/patches/0100-remove-development-test.patch
+++ b/debian/patches/0100-remove-development-test.patch
@@ -11,7 +11,7 @@ Bundler will fail when it can't find these locally
  # Disable strong_params so that Mash does not respond to :permitted?
  gem 'hashie-forbidden_attributes'
 @@ -308,7 +307,6 @@
- gem 'rails-i18n', '~> 5.1'
+ gem 'rails-i18n', '~> 6.0'
  gem 'gettext_i18n_rails', '~> 1.8'
  gem 'gettext_i18n_rails_js', '~> 1.3'
 -gem 'gettext', '~> 3.2', '>= 3.2.2', require: false, group: :development
@@ -39,18 +39,18 @@ Bundler will fail when it can't find these locally
 -
  group :development, :test do
 -  gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
-   gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri
-   gem 'pry-rails', '~> 0.3.4'
+   gem 'pry-byebug', '~> 3.5', platform: :mri
+   gem 'pry-rails', '~> 0.3.9'
  
 @@ -366,16 +348,7 @@
    gem 'spring', '~> 2.0'
    gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
  
--  gem 'gitlab-styles', '~> 2.7', require: false
+-  gem 'gitlab-styles', '~> 3.1', 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 'rubocop', '~> 0.74.0'
+-  gem 'rubocop-performance', '~> 1.4', '>= 1.4.1'
+-  gem 'rubocop-rspec', '~> 1.37'
 -
 -  gem 'scss_lint', '~> 0.56.0', require: false
 -  gem 'haml_lint', '~> 0.34.0', require: false
@@ -59,8 +59,8 @@ Bundler will fail when it can't find these locally
  
    gem 'benchmark-ips', '~> 2.3', require: false
  
-@@ -388,11 +361,6 @@
-   gem 'timecop', '~> 0.8.0'
+@@ -390,11 +363,6 @@
+   gem 'parallel', '~> 1.19', require: false
  end
  
 -# Gems required in omnibus-gitlab pipeline
diff --git a/debian/patches/0110-make-test-dependencies-conditional.patch b/debian/patches/0110-make-test-dependencies-conditional.patch
index 6d5f2c980b..74393fba6f 100644
--- a/debian/patches/0110-make-test-dependencies-conditional.patch
+++ b/debian/patches/0110-make-test-dependencies-conditional.patch
@@ -1,18 +1,17 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -329,7 +329,7 @@
-   gem 'raindrops', '~> 0.18'
+@@ -330,6 +330,7 @@
  end
  
--group :development, :test do
+ group :development, :test do
 +if ENV["INCLUDE_TEST_DEPENDS"] == "true"
-   gem 'pry-byebug', '~> 3.5', '>= 3.5.1', platform: :mri
-   gem 'pry-rails', '~> 0.3.4'
+   gem 'pry-byebug', '~> 3.5', platform: :mri
+   gem 'pry-rails', '~> 0.3.9'
  
-@@ -359,9 +359,6 @@
-   gem 'simple_po_parser', '~> 1.1', '>= 1.1.2', require: false
+@@ -361,9 +362,6 @@
+   gem 'png_quantizator', '~> 0.2.1', require: false
  
-   gem 'timecop', '~> 0.8.0'
+   gem 'parallel', '~> 1.19', require: false
 -end
 -
 -group :test do
diff --git a/debian/patches/0430-remove-gitlab-markup.patch b/debian/patches/0430-remove-gitlab-markup.patch
index c97818be14..02e9b67312 100644
--- a/debian/patches/0430-remove-gitlab-markup.patch
+++ b/debian/patches/0430-remove-gitlab-markup.patch
@@ -3,7 +3,7 @@
 @@ -137,7 +137,6 @@
  # Markdown and HTML processing
  gem 'html-pipeline', '~> 2.12'
- gem 'deckar01-task_list', '2.2.1'
+ gem 'deckar01-task_list', '2.3.1'
 -gem 'gitlab-markup', '~> 1.7'
  gem 'github-markup', '~> 1.7', require: 'github/markup'
  gem 'commonmarker', '~> 0.20'
diff --git a/debian/patches/0470-relax-bootsnap.patch b/debian/patches/0470-relax-bootsnap.patch
index 5357ea5f11..e10da92f9c 100644
--- a/debian/patches/0470-relax-bootsnap.patch
+++ b/debian/patches/0470-relax-bootsnap.patch
@@ -2,7 +2,7 @@
 +++ b/Gemfile
 @@ -2,7 +2,7 @@
  
- gem 'rails', '5.2.3'
+ gem 'rails', '6.0.2'
  
 -gem 'bootsnap', '~> 1.4'
 +gem 'bootsnap', '~> 1.3'
diff --git a/debian/patches/0480-embed-elasticsearch-model.patch b/debian/patches/0480-embed-elasticsearch-model.patch
index db723ac2ec..384891a1f3 100644
--- a/debian/patches/0480-embed-elasticsearch-model.patch
+++ b/debian/patches/0480-embed-elasticsearch-model.patch
@@ -4,8 +4,8 @@
  gem 'seed-fu', '~> 2.3', '>= 2.3.7'
  
  # Search
--gem 'elasticsearch-model', '~> 0.1.9'
+-gem 'elasticsearch-model', '~> 6.1'
 +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', '>= 5.0.3'
+ gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation'
+ gem 'elasticsearch-api',   '~> 6.8'
  gem 'aws-sdk'
diff --git a/debian/patches/0480-embed-elasticsearch-rails.patch b/debian/patches/0480-embed-elasticsearch-rails.patch
index 55a7665063..94f5890b04 100644
--- a/debian/patches/0480-embed-elasticsearch-rails.patch
+++ b/debian/patches/0480-embed-elasticsearch-rails.patch
@@ -4,8 +4,8 @@
  
  # 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', '~> 6.1', 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 'elasticsearch-api',   '~> 6.8'
  gem 'aws-sdk'
  gem 'faraday_middleware-aws-signers-v4'
diff --git a/debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch b/debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch
index 829256c5cc..84ba86be63 100644
--- a/debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch
+++ b/debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch
@@ -2,7 +2,7 @@
 +++ b/Gemfile
 @@ -132,7 +132,7 @@
  gem 'elasticsearch-rails', '~> 0.1.9', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails'
- gem 'elasticsearch-api',   '~> 5.0', '>= 5.0.3'
+ gem 'elasticsearch-api',   '~> 6.8'
  gem 'aws-sdk'
 -gem 'faraday_middleware-aws-signers-v4'
 +gem 'faraday_middleware-aws-signers-v4', path: 'vendor/gems/faraday-middleware-aws-signers-v4'
diff --git a/debian/patches/0484-relax-asciidoctor-plantuml.patch b/debian/patches/0484-relax-asciidoctor-plantuml.patch
index 7a374fe9a3..bd8b487851 100644
--- a/debian/patches/0484-relax-asciidoctor-plantuml.patch
+++ b/debian/patches/0484-relax-asciidoctor-plantuml.patch
@@ -1,52 +1,11 @@
-From 5436888284517f56d90749f87f255bc6bda8a144 Mon Sep 17 00:00:00 2001
-From: Pirate Praveen <praveen@debian.org>
-Date: Mon, 23 Dec 2019 08:43:32 +0000
-Subject: [PATCH 1/2] Update asciidoctor-plantuml 0.0.9 -> 0.0.10
-
----
- Gemfile      | 2 +-
- Gemfile.lock | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
 --- a/Gemfile
 +++ b/Gemfile
 @@ -143,7 +143,7 @@
  gem 'wikicloth', '0.8.1'
  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 'asciidoctor-plantuml', '~> 0.0.10'
- gem 'rouge', '~> 3.11'
+ gem 'rouge', '~> 3.15'
  gem 'truncato', '~> 0.7.11'
  gem 'bootstrap_form', '~> 4.2'
---- a/Gemfile.lock
-+++ b/Gemfile.lock
-@@ -71,7 +71,7 @@
-     asciidoctor (2.0.10)
-     asciidoctor-include-ext (0.3.1)
-       asciidoctor (>= 1.5.6, < 3.0.0)
--    asciidoctor-plantuml (0.0.9)
-+    asciidoctor-plantuml (0.0.10)
-       asciidoctor (>= 1.5.6, < 3.0.0)
-     ast (2.4.0)
-     atlassian-jwt (0.2.0)
-@@ -1126,7 +1126,7 @@
-   asana (~> 0.9)
-   asciidoctor (~> 2.0.10)
-   asciidoctor-include-ext (~> 0.3.1)
--  asciidoctor-plantuml (= 0.0.9)
-+  asciidoctor-plantuml (= 0.0.10)
-   atlassian-jwt (~> 0.2.0)
-   attr_encrypted (~> 3.1.0)
-   awesome_print
---- a/lib/banzai/filter/plantuml_filter.rb
-+++ b/lib/banzai/filter/plantuml_filter.rb
-@@ -1,7 +1,7 @@
- # frozen_string_literal: true
- 
- require "nokogiri"
--require "asciidoctor-plantuml/plantuml"
-+require "asciidoctor_plantuml/plantuml"
- 
- module Banzai
-   module Filter
diff --git a/debian/patches/0486-relax-grpc-protobuf.patch b/debian/patches/0486-relax-grpc-protobuf.patch
index 34b9dd3549..c71ebd1ad9 100644
--- a/debian/patches/0486-relax-grpc-protobuf.patch
+++ b/debian/patches/0486-relax-grpc-protobuf.patch
@@ -1,8 +1,8 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -408,9 +408,9 @@
+@@ -412,9 +412,9 @@
  # Gitaly GRPC protocol definitions
- gem 'gitaly', '~> 1.73'
+ gem 'gitaly', '~> 1.86'
  
 -gem 'grpc', '~> 1.24'
 +gem 'grpc', '~> 1.19'
@@ -10,5 +10,5 @@
 -gem 'google-protobuf', '~> 3.8'
 +gem 'google-protobuf', '~> 3.7'
  
- gem 'toml-rb', '~> 1.0', require: false
+ gem 'toml-rb', '~> 1.0'
  
diff --git a/debian/patches/0510-remove-dev-dependencies.patch b/debian/patches/0510-remove-dev-dependencies.patch
index 212faa5173..9a69018e70 100644
--- a/debian/patches/0510-remove-dev-dependencies.patch
+++ b/debian/patches/0510-remove-dev-dependencies.patch
@@ -1,14 +1,12 @@
 --- a/package.json
 +++ b/package.json
-@@ -143,62 +143,6 @@
+@@ -145,61 +145,6 @@
      "xterm": "^3.5.0"
    },
    "devDependencies": {
 -    "@babel/plugin-transform-modules-commonjs": "^7.5.0",
--    "@gitlab/eslint-config": "^2.0.0",
--    "@gitlab/eslint-plugin-i18n": "^1.1.0",
--    "@gitlab/eslint-plugin-vue-i18n": "^1.2.0",
--    "@vue/test-utils": "^1.0.0-beta.25",
+-    "@gitlab/eslint-config": "^3.0.0",
+-    "@vue/test-utils": "^1.0.0-beta.30",
 -    "axios-mock-adapter": "^1.15.0",
 -    "babel-jest": "^24.1.0",
 -    "babel-plugin-dynamic-import-node": "^2.2.0",
@@ -18,10 +16,10 @@
 -    "commander": "^2.18.0",
 -    "custom-jquery-matchers": "^2.1.0",
 -    "docdash": "^1.0.2",
--    "eslint": "~5.9.0",
+-    "eslint": "^6.8.0",
 -    "eslint-import-resolver-jest": "^2.1.1",
--    "eslint-import-resolver-webpack": "^0.10.1",
--    "eslint-plugin-jasmine": "^2.10.1",
+-    "eslint-import-resolver-webpack": "^0.12.1",
+-    "eslint-plugin-jasmine": "^4.1.0",
 -    "eslint-plugin-jest": "^22.3.0",
 -    "eslint-plugin-no-jquery": "^2.3.0",
 -    "gettext-extractor": "^3.4.3",
@@ -59,7 +57,8 @@
 -    "timezone-mock": "^1.0.8",
 -    "vue-jest": "^4.0.0-beta.2",
 -    "webpack-dev-server": "^3.8.1",
+-    "yarn-check-webpack-plugin": "^1.2.0",
 -    "yarn-deduplicate": "^1.1.1"
    },
    "resolutions": {
-     "vue-jest/ts-jest": "24.0.0"
+     "vue-jest/ts-jest": "24.0.0",
diff --git a/debian/patches/0520-add-system-lib-path-for-webpack.patch b/debian/patches/0520-add-system-lib-path-for-webpack.patch
index 018124e03a..ee3d35bad4 100644
--- a/debian/patches/0520-add-system-lib-path-for-webpack.patch
+++ b/debian/patches/0520-add-system-lib-path-for-webpack.patch
@@ -1,6 +1,6 @@
 --- a/config/webpack.config.js
 +++ b/config/webpack.config.js
-@@ -151,9 +151,14 @@
+@@ -153,9 +153,14 @@
  
    resolve: {
      extensions: ['.js', '.gql', '.graphql'],
diff --git a/debian/patches/0630-fix-mail-room-path.patch b/debian/patches/0630-fix-mail-room-path.patch
index 0eab53fc1d..4837524b7d 100644
--- a/debian/patches/0630-fix-mail-room-path.patch
+++ b/debian/patches/0630-fix-mail-room-path.patch
@@ -5,6 +5,6 @@
    <%
 -    require_relative "../lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom)
 +    require "/usr/share/gitlab/lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom)
-     config = Gitlab::MailRoom.config
- 
-     if Gitlab::MailRoom.enabled?
+     Gitlab::MailRoom.enabled_configs.each do |config|
+   %>
+     -
diff --git a/debian/patches/0710-use-yarnpkg.patch b/debian/patches/0710-use-yarnpkg.patch
index 857cf59876..c4efef3b19 100644
--- a/debian/patches/0710-use-yarnpkg.patch
+++ b/debian/patches/0710-use-yarnpkg.patch
@@ -2,7 +2,7 @@ Yarn executable in debian is yarnpkg
 
 --- a/lib/tasks/yarn.rake
 +++ b/lib/tasks/yarn.rake
-@@ -2,7 +2,7 @@
+@@ -3,7 +3,7 @@
  namespace :yarn do
    desc 'Ensure Yarn is installed'
    task :available do
@@ -11,7 +11,7 @@ Yarn executable in debian is yarnpkg
        warn(
          'Error: Yarn executable was not detected in the system.'.color(:red),
          'Download Yarn at https://yarnpkg.com/en/docs/install'.color(:green)
-@@ -13,10 +13,10 @@
+@@ -14,10 +14,10 @@
  
    desc 'Ensure Node dependencies are installed'
    task check: ['yarn:available'] do
@@ -25,7 +25,7 @@ Yarn executable in debian is yarnpkg
        )
        abort
      end
-@@ -24,7 +24,7 @@
+@@ -25,7 +25,7 @@
  
    desc 'Install Node dependencies with Yarn'
    task install: ['yarn:available'] do
diff --git a/debian/patches/0730-install-graphql-tag.patch b/debian/patches/0730-install-graphql-tag.patch
index 042c910781..19dfee174d 100644
--- a/debian/patches/0730-install-graphql-tag.patch
+++ b/debian/patches/0730-install-graphql-tag.patch
@@ -3,11 +3,11 @@ Author: Utkarsh Gupta <guptautkarsh2102@gmail.com>
 
 --- a/package.json
 +++ b/package.json
-@@ -82,6 +82,7 @@
+@@ -84,6 +84,7 @@
      "fuzzaldrin-plus": "^0.5.0",
      "glob": "^7.1.2",
      "graphql": "^14.0.2",
 +    "graphql-tag": "^2.0.0",
+     "immer": "^5.2.1",
      "imports-loader": "^0.8.0",
      "jed": "^1.1.1",
-     "jest-transform-graphql": "^2.1.0",
diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch
index c487d02412..e1a2b0fb5d 100644
--- a/debian/patches/0740-use-packaged-modules.patch
+++ b/debian/patches/0740-use-packaged-modules.patch
@@ -8,7 +8,7 @@
  const CopyWebpackPlugin = require('copy-webpack-plugin');
  const vendorDllHash = require('./helpers/vendor_dll_hash');
  
-@@ -151,12 +150,12 @@
+@@ -153,12 +152,12 @@
  
    resolve: {
      extensions: ['.js', '.gql', '.graphql'],
@@ -23,7 +23,7 @@
    },
  
    module: {
-@@ -431,19 +430,6 @@
+@@ -433,19 +432,6 @@
      // enable HMR only in webpack-dev-server
      DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
  
@@ -43,7 +43,7 @@
      new webpack.DefinePlugin({
        // This one is used to define window.gon.ee and other things properly in tests:
        'process.env.IS_EE': JSON.stringify(IS_EE),
-@@ -469,6 +455,7 @@
+@@ -471,6 +457,7 @@
  
    node: {
      fs: 'empty', // sqljs requires fs
@@ -53,23 +53,25 @@
  };
 --- a/package.json
 +++ b/package.json
-@@ -50,62 +50,33 @@
+@@ -50,65 +50,36 @@
+     "apollo-link": "^1.2.11",
      "apollo-link-batch-http": "^1.2.11",
      "apollo-upload-client": "^10.0.0",
-     "at.js": "^1.5.4",
 -    "autosize": "^4.0.0",
      "aws-sdk": "^2.526.0",
 -    "axios": "^0.19.0",
      "babel-loader": "^8.0.6",
+     "babel-plugin-lodash": "^3.3.4",
 -    "bootstrap": "4.3.1",
+     "bootstrap-vue": "2.1.0",
 -    "brace-expansion": "^1.1.8",
      "cache-loader": "^4.1.0",
 -    "chart.js": "2.7.2",
      "classlist-polyfill": "^1.2.0",
 -    "clipboard": "^1.7.1",
      "codesandbox-api": "^0.0.20",
-     "compression-webpack-plugin": "^3.0.0",
-     "copy-webpack-plugin": "^5.0.4",
+     "compression-webpack-plugin": "^3.0.1",
+     "copy-webpack-plugin": "^5.0.5",
 -    "core-js": "^3.2.1",
      "cropper": "^2.3.0",
 -    "css-loader": "^1.0.0",
@@ -77,7 +79,7 @@
 -    "d3-scale": "^1.0.7",
 -    "d3-selection": "^1.2.0",
 -    "dateformat": "^3.0.3",
--    "deckar01-task_list": "^2.2.1",
+-    "deckar01-task_list": "^2.3.1",
      "diff": "^3.4.0",
      "document-register-element": "1.13.1",
      "dropzone": "^4.2.0",
@@ -90,6 +92,7 @@
 -    "glob": "^7.1.2",
      "graphql": "^14.0.2",
      "graphql-tag": "^2.0.0",
+     "immer": "^5.2.1",
 -    "imports-loader": "^0.8.0",
 -    "jed": "^1.1.1",
      "jest-transform-graphql": "^2.1.0",
@@ -103,8 +106,8 @@
      "katex": "^0.10.0",
 -    "lodash": "^4.17.15",
 -    "marked": "^0.3.12",
-     "mermaid": "^8.4.2",
-     "monaco-editor": "^0.15.6",
+     "mermaid": "^8.4.5",
+     "monaco-editor": "^0.18.1",
      "monaco-editor-webpack-plugin": "^1.7.0",
 -    "mousetrap": "^1.4.6",
      "pdfjs-dist": "^2.0.943",
@@ -116,7 +119,7 @@
      "raphael": "^2.2.7",
      "raw-loader": "^3.1.0",
      "sanitize-html": "^1.20.0",
-@@ -119,13 +90,9 @@
+@@ -121,13 +92,9 @@
      "svg4everybody": "2.1.9",
      "swagger-ui-dist": "^3.24.3",
      "three": "^0.84.0",
@@ -130,12 +133,12 @@
      "url-loader": "^2.1.0",
      "visibilityjs": "^1.2.4",
      "vue": "^2.6.10",
-@@ -135,13 +102,7 @@
+@@ -137,13 +104,7 @@
      "vue-template-compiler": "^2.6.10",
-     "vue-virtual-scroll-list": "^1.3.1",
+     "vue-virtual-scroll-list": "^1.4.4",
      "vuedraggable": "^2.23.0",
 -    "vuex": "^3.1.0",
--    "webpack": "^4.40.2",
+-    "webpack": "^4.41.5",
 -    "webpack-bundle-analyzer": "^3.5.1",
 -    "webpack-cli": "^3.3.9",
 -    "webpack-stats-plugin": "^0.3.0",
diff --git a/debian/patches/0750-fix-relative-paths.patch b/debian/patches/0750-fix-relative-paths.patch
index d016c478f7..ccbf256861 100644
--- a/debian/patches/0750-fix-relative-paths.patch
+++ b/debian/patches/0750-fix-relative-paths.patch
@@ -12,13 +12,12 @@
  Settings['ldap'] ||= Settingslogic.new({})
 --- a/config/environment.rb
 +++ b/config/environment.rb
-@@ -1,6 +1,6 @@
- # Load the rails application
- 
+@@ -1,5 +1,5 @@
+ # Load the Rails application.
 -require_relative 'application'
 +require '/usr/share/gitlab/config/application'
  
- # Initialize the rails application
+ # Initialize the Rails application.
  Rails.application.initialize!
 --- a/config/settings.rb
 +++ b/config/settings.rb