www/gitlab-ce: Major upgrade to 13.11.1.

Changelog:
https://about.gitlab.com/releases/2021/04/22/gitlab-13-11-released/
https://about.gitlab.com/releases/2021/04/23/gitlab-13-11-1-released/

1 files changed, 20 insertions, 30 deletions

diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index 5662c120f8d3..33ab026fbd01 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,6 +1,6 @@
---- Gemfile.orig	2021-03-31 12:23:42 UTC
+--- Gemfile.orig	2021-04-22 21:13:23 UTC
 +++ Gemfile
-@@ -83,7 +83,7 @@ gem 'gpgme', '~> 2.0.19'
+@@ -85,7 +85,7 @@ gem 'gpgme', '~> 2.0.19'
  # 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'
@@ -9,7 +9,7 @@
  
  # API
  gem 'grape', '~> 1.5.2'
-@@ -97,7 +97,6 @@ gem 'graphql', '~> 1.11.8'
+@@ -99,7 +99,6 @@ gem 'graphql', '~> 1.11.8'
  # https://gitlab.com/gitlab-org/gitlab/issues/31747
  gem 'graphiql-rails', '~> 1.4.10'
  gem 'apollo_upload_server', '~> 2.0.2'
@@ -17,16 +17,16 @@
  gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
  
  gem 'hashie'
-@@ -152,7 +151,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/mark
+@@ -154,7 +153,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/mark
  gem 'commonmarker', '~> 0.21'
- gem 'kramdown', '~> 2.3.0'
+ gem 'kramdown', '~> 2.3.1'
  gem 'RedCloth', '~> 4.3.2'
 -gem 'rdoc', '~> 6.1.2'
 +gem 'rdoc', '~> 6.1'
  gem 'org-ruby', '~> 0.9.12'
  gem 'creole', '~> 0.5.0'
  gem 'wikicloth', '0.8.1'
-@@ -335,107 +334,13 @@ gem 'snowplow-tracker', '~> 0.6.1'
+@@ -334,106 +333,11 @@ gem 'snowplow-tracker', '~> 0.6.1'
  # Metrics
  group :metrics do
    gem 'method_source', '~> 1.0', require: false
@@ -36,16 +36,15 @@
    # Prometheus
    gem 'prometheus-client-mmap', '~> 0.12.0'
    gem 'raindrops', '~> 0.18'
- end
- 
+-end
+-
 -group :development do
--  gem 'brakeman', '~> 4.2', require: false
--  gem 'lefthook', '~> 0.7', require: false
+-  gem 'lefthook', '~> 0.7.0', require: false
 -
--  gem 'letter_opener_web', '~> 1.3.4'
+-  gem 'letter_opener_web', '~> 1.4.0'
 -
 -  # Better errors handler
--  gem 'better_errors', '~> 2.7.1'
+-  gem 'better_errors', '~> 2.9.0'
 -
 -  # thin instead webrick
 -  gem 'thin', '~> 1.8.0'
@@ -62,7 +61,7 @@
 -
 -  gem 'database_cleaner', '~> 1.7.0'
 -  gem 'factory_bot_rails', '~> 6.1.0'
--  gem 'rspec-rails', '~> 4.0.2'
+-  gem 'rspec-rails', '~> 5.0.1'
 -
 -  # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
 -  gem 'minitest', '~> 5.11.0'
@@ -73,14 +72,14 @@
 -  gem 'spring', '~> 2.1.0'
 -  gem 'spring-commands-rspec', '~> 1.0.4'
 -
--  gem 'gitlab-styles', '~> 6.1.0', require: false
+-  gem 'gitlab-styles', '~> 6.2.0', require: false
 -
 -  gem 'haml_lint', '~> 0.36.0', require: false
 -  gem 'bundler-audit', '~> 0.7.0.1', require: false
 -
 -  gem 'benchmark-ips', '~> 2.3.0', require: false
 -
--  gem 'knapsack', '~> 1.17'
+-  gem 'knapsack', '~> 1.21.1'
 -  gem 'crystalball', '~> 0.7.0', require: false
 -
 -  gem 'simple_po_parser', '~> 1.1.2', require: false
@@ -92,11 +91,12 @@
 -  gem 'parallel', '~> 1.19', require: false
 -
 -  gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
+-
+-  gem 'test_file_finder', '~> 0.1.3'
 -end
 -
 -group :development, :test, :danger do
--  gem 'danger-gitlab', '~> 8.0', require: false
--  gem 'gitlab-dangerfiles', '~> 0.8.0', require: false
+-  gem 'gitlab-dangerfiles', '~> 1.1.1', require: false
 -end
 -
 -group :development, :test, :coverage do
@@ -110,6 +110,7 @@
 -end
 -
 -group :test do
+-  gem 'json-schema', '~> 2.8.0'
 -  gem 'fuubar', '~> 2.2.0'
 -  gem 'rspec-retry', '~> 0.6.1'
 -  gem 'rspec_profiling', '~> 0.0.6'
@@ -130,17 +131,6 @@
 -
 -  # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
 -  gem 'derailed_benchmarks', require: false
--end
--
- gem 'octokit', '~> 4.15'
- 
- # https://gitlab.com/gitlab-org/gitlab/issues/207207
-@@ -479,7 +384,7 @@ gem 'gitaly', '~> 13.9.0.pre.rc1'
- 
- gem 'grpc', '~> 1.30.2'
- 
--gem 'google-protobuf', '~> 3.12'
-+gem 'google-protobuf', '~> 3.14.0'
- 
- gem 'toml-rb', '~> 1.0.0'
+ end
  
+ gem 'octokit', '~> 4.15'