gitlab: 13.0.14 -> 13.4.3

13.4.3
4 years ago · c16a977386
parent 8b010d8904
commit c16a977386
18 changed files with 5156 additions and 2175 deletions
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@ -1,13 +1,13 @@
 {
-  "version": "13.0.14",
-  "repo_hash": "15is18x631ifsj4iwmrs1s9lc3i99hwsxxf5v42qldbmsys31l1k",
+  "version": "13.4.3",
+  "repo_hash": "19nk692ik26qcc1gcvbbrvadg6169v34gd8h7d5bwfjk12idj1id",
  "owner": "gitlab-org",
  "repo": "gitlab",
-  "rev": "v13.0.14-ee",
+  "rev": "v13.4.3-ee",
  "passthru": {
-    "GITALY_SERVER_VERSION": "13.0.14",
-    "GITLAB_PAGES_VERSION": "1.18.0",
-    "GITLAB_SHELL_VERSION": "13.2.0",
-    "GITLAB_WORKHORSE_VERSION": "8.31.2"
+    "GITALY_SERVER_VERSION": "13.4.3",
+    "GITLAB_PAGES_VERSION": "1.25.0",
+    "GITLAB_SHELL_VERSION": "13.7.0",
+    "GITLAB_WORKHORSE_VERSION": "8.46.0"
  }
 }
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv
-, ruby, tzdata, git, nettools, nixosTests, nodejs
+, ruby, tzdata, git, nettools, nixosTests, nodejs, openssl
 , gitlabEnterprise ? false, callPackage, yarn
 , fixup_yarn_lock, replace
 }:
@ -28,6 +28,10 @@ let
          patches = [ ./fix-grpc-ar.patch ];
          dontBuild = false;
        };
+        # the openssl needs the openssl include files
+        openssl = x.openssl // {
+          buildInputs = [ openssl ];
+        };
      };
    groups = [
      "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos"
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@ -10,9 +10,9 @@ gem 'activesupport', '~> 6.0.3.1'
 gem 'rdoc', '~> 6.0'
 gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false
 gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false
-gem 'grpc', '~> 1.24.0'
-gem 'sentry-raven', '~> 2.9.0', require: false
-gem 'faraday', '~> 0.12'
+gem 'grpc', '~> 1.30.2'
+gem 'sentry-raven', '~> 3.0', require: false
+gem 'faraday', '~> 1.0'
 gem 'rbtrace', require: false

 # Labkit provides observability functionality
@ -22,7 +22,7 @@ gem 'gitlab-labkit', '~> 0.12.0'
 # This version needs to be in sync with GitLab CE/EE
 gem 'licensee', '~> 8.9.0'

-gem 'google-protobuf', '~> 3.8.0'
+gem 'google-protobuf', '~> 3.12'

 group :development, :test do
  gem 'rubocop', '~> 0.69', require: false
@ -32,7 +32,7 @@ group :development, :test do
  gem 'factory_bot', require: false
  gem 'pry', '~> 0.12.2', require: false

-  gem 'grpc-tools', '= 1.0.1'
+  gem 'grpc-tools', '= 1.30.2'

  # gitlab-shell spec gems
  gem 'listen', '~> 0.5.0'
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@ -45,9 +45,9 @@ GEM
    escape_utils (1.2.1)
    factory_bot (5.0.2)
      activesupport (>= 4.2.0)
-    faraday (0.15.4)
+    faraday (1.0.1)
      multipart-post (>= 1.2, < 3)
-    ffi (1.12.2)
+    ffi (1.13.1)
    gemojione (3.3.0)
      json
    github-linguist (7.9.0)
@ -75,13 +75,13 @@ GEM
      opentracing (~> 0.4)
      redis (> 3.0.0, < 5.0.0)
    gitlab-markup (1.7.1)
-    google-protobuf (3.8.0)
-    googleapis-common-protos-types (1.0.4)
-      google-protobuf (~> 3.0)
-    grpc (1.24.0)
-      google-protobuf (~> 3.8)
+    google-protobuf (3.12.4)
+    googleapis-common-protos-types (1.0.5)
+      google-protobuf (~> 3.11)
+    grpc (1.30.2)
+      google-protobuf (~> 3.12)
      googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.0.1)
+    grpc-tools (1.30.2)
    hashdiff (0.3.9)
    i18n (1.8.2)
      concurrent-ruby (~> 1.0)
@ -100,20 +100,20 @@ GEM
    memoizable (0.4.2)
      thread_safe (~> 0.3, >= 0.3.1)
    method_source (0.9.2)
-    mime-types (3.2.2)
+    mime-types (3.3.1)
      mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2020.0512)
    mini_mime (1.0.2)
    mini_portile2 (2.4.0)
    minitest (5.14.0)
-    msgpack (1.3.1)
-    multipart-post (2.0.0)
-    nokogiri (1.10.9)
+    msgpack (1.3.3)
+    multipart-post (2.1.1)
+    nokogiri (1.10.10)
      mini_portile2 (~> 2.4.0)
    nokogumbo (1.5.0)
      nokogiri
    opentracing (0.5.0)
-    optimist (3.0.0)
+    optimist (3.0.1)
    parallel (1.17.0)
    parser (2.7.0.5)
      ast (~> 2.4.0)
@ -135,13 +135,13 @@ GEM
    rails-html-sanitizer (1.3.0)
      loofah (~> 2.3)
    rainbow (3.0.0)
-    rbtrace (0.4.11)
+    rbtrace (0.4.14)
      ffi (>= 1.0.6)
      msgpack (>= 0.4.3)
      optimist (>= 3.0.0)
    rdoc (6.2.0)
    redis (4.1.3)
-    rouge (3.19.0)
+    rouge (3.20.0)
    rspec (3.8.0)
      rspec-core (~> 3.8.0)
      rspec-expectations (~> 3.8.0)
@ -175,8 +175,8 @@ GEM
      crass (~> 1.0.2)
      nokogiri (>= 1.4.4)
      nokogumbo (~> 1.4)
-    sentry-raven (2.9.0)
-      faraday (>= 0.7.6, < 1.0)
+    sentry-raven (3.0.4)
+      faraday (>= 1.0)
    simplecov (0.17.1)
      docile (~> 1.1)
      json (>= 1.8, < 3)
@ -211,15 +211,15 @@ DEPENDENCIES
  activesupport (~> 6.0.3.1)
  bundler (>= 1.17.3)
  factory_bot
-  faraday (~> 0.12)
+  faraday (~> 1.0)
  github-linguist (~> 7.9)
  gitlab-gollum-lib (~> 4.2.7.9)
  gitlab-gollum-rugged_adapter (~> 0.4.4.2)
  gitlab-labkit (~> 0.12.0)
  gitlab-markup (~> 1.7.1)
-  google-protobuf (~> 3.8.0)
-  grpc (~> 1.24.0)
-  grpc-tools (= 1.0.1)
+  google-protobuf (~> 3.12)
+  grpc (~> 1.30.2)
+  grpc-tools (= 1.30.2)
  licensee (~> 8.9.0)
  listen (~> 0.5.0)
  pry (~> 0.12.2)
@ -229,7 +229,7 @@ DEPENDENCIES
  rspec-parameterized
  rubocop (~> 0.69)
  rugged (~> 0.28)
-  sentry-raven (~> 2.9.0)
+  sentry-raven (~> 3.0)
  simplecov (~> 0.17.1)
  timecop
  vcr (~> 4.0.0)
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@ -19,14 +19,14 @@ let
      };
  };
 in buildGoPackage rec {
-  version = "13.0.14";
+  version = "13.4.3";
  pname = "gitaly";

  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitaly";
    rev = "v${version}";
-    sha256 = "16ynkwiv0faa60msashj5w1bc4rdh7yv2qjmpcbf7dwq54gqmlbv";
+    sha256 = "0gyy8l3xbdrpbq8zmdqvn7x34hxc48in4klhw5klacs1mgi3vqax";
  };

  # Fix a check which assumes that hook files are writeable by their
@ -44,7 +44,7 @@ in buildGoPackage rec {
  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [ rubyEnv.wrappedRuby libgit2_0_27 ];
  goDeps = ./deps.nix;
-  preBuild = "rm -r go/src/gitlab.com/gitlab-org/labkit/vendor";
+  preBuild = "rm -rf go/src/gitlab.com/gitlab-org/labkit/vendor";

  postInstall = ''
    mkdir -p $ruby
--- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
@ -1787,8 +1787,8 @@
    fetch = {
      type = "git";
      url = "https://gitlab.com/gitlab-org/gitlab-shell.git";
-      rev = "716e30c55e89";
-      sha256 = "0g2bgwm5rf93xfd40j3d2a5js1a212r2l2qdbds3gp7h0v73npjw";
+      rev = "82ec8144fb2a";
+      sha256 = "1gh3rwnd6688v7q07g2y69fdz2nyy7disjqifvbl7z1cpfw4h45b";
    };
  }
  {
@ -1796,8 +1796,8 @@
    fetch = {
      type = "git";
      url = "https://gitlab.com/gitlab-org/labkit.git";
-      rev = "0149780c759d";
-      sha256 = "1krp5jkwpckpdznbl9xp4yvq6cii750r24agcni3snbbs8hd8gb1";
+      rev = "45895e129029";
+      sha256 = "17adv1gcdg0jiy8i5lr064pm3p9ywq6s0iwh9w4q5pycp4qkmn48";
    };
  }
  {
@ -1913,8 +1913,8 @@
    fetch = {
      type = "git";
      url = "https://go.googlesource.com/text";
-      rev = "v0.3.2";
-      sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
+      rev = "v0.3.3";
+      sha256 = "19pihqm3phyndmiw6i42pdv6z1rbvlqlsnhsyqf9gsnn0qnmqqlh";
    };
  }
  {
--- a/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch
+++ b/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch
@ -1,8 +1,8 @@
-diff --git a/internal/config/config.go b/internal/config/config.go
-index 037c9602..3d5409dc 100644
--- a/internal/config/config.go
-+++ b/internal/config/config.go
-@@ -185,7 +185,7 @@ func checkExecutable(path string) error {
+diff --git a/internal/gitaly/config/config.go b/internal/gitaly/config/config.go
+index 993e095d..f9bbb943 100644
+--- a/internal/gitaly/config/config.go
+++ b/internal/gitaly/config/config.go
+@@ -217,7 +217,7 @@ func checkExecutable(path string) error {
 		return err
 	}
 
--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@ -203,20 +203,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0s72m05jvzc1pd6cw1i289chas399q0a14xrwg4rvkdwy7bgzrh0";
+      sha256 = "0wwks9652xwgjm7yszcq5xr960pjypc07ivwzbjzpvy9zh2fw6iq";
      type = "gem";
    };
-    version = "0.15.4";
+    version = "1.0.1";
  };
  ffi = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4";
+      sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af";
      type = "gem";
    };
-    version = "1.12.2";
+    version = "1.13.1";
  };
  gemojione = {
    dependencies = ["json"];
@ -294,10 +294,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0by3289irdklb9gjqw41fq6mg6yja3iyzh99dj8p8z9l4brllqn4";
+      sha256 = "1m3la0yid3bqx9b30raisqbp27d0q7vdrlslazrdasf8v1vhifxj";
      type = "gem";
    };
-    version = "3.8.0";
+    version = "3.12.4";
  };
  googleapis-common-protos-types = {
    dependencies = ["google-protobuf"];
@ -305,10 +305,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0hyr94cafiqj0k8q19hnl658pmbz2b404akikzfv4hdb1j1bwsg1";
+      sha256 = "1aava1b75n056s24gn7ajrkmm6s3xa3swl62dl5q9apw4marghji";
      type = "gem";
    };
-    version = "1.0.4";
+    version = "1.0.5";
  };
  grpc = {
    dependencies = ["google-protobuf" "googleapis-common-protos-types"];
@ -316,20 +316,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "18wikj9qd4jb4lks55cs2cf3q7fifnanm9z9ywnxhpj57vbnilpf";
+      sha256 = "1rsglf7ag17n465iff7vlw83pn2rpl4kv9sb1rpf17nx6xpi7yl5";
      type = "gem";
    };
-    version = "1.24.0";
+    version = "1.30.2";
  };
  grpc-tools = {
    groups = ["development" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0pjs2sm43mai2fy0jsbxl8rs9bych8f5j8hv630fjwh0323cmcc9";
+      sha256 = "0k9zhsqhamp02ryzgfb4y2bbick151vlhrhj0kqbbz9lyhms0bd4";
      type = "gem";
    };
-    version = "1.0.1";
+    version = "1.30.2";
  };
  hashdiff = {
    groups = ["default" "development" "test"];
@ -438,22 +438,24 @@
  };
  mime-types = {
    dependencies = ["mime-types-data"];
+    groups = ["default"];
+    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0fjxy1jm52ixpnv3vg9ld9pr9f35gy0jp66i1njhqjvmnvq0iwwk";
+      sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh";
      type = "gem";
    };
-    version = "3.2.2";
+    version = "3.3.1";
  };
  mime-types-data = {
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1m00pg19cm47n1qlcxgl91ajh2yq0fszvn1vy8fy0s1jkrp9fw4a";
+      sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753";
      type = "gem";
    };
-    version = "3.2019.0331";
+    version = "3.2020.0512";
  };
  mini_mime = {
    groups = ["default"];
@ -488,18 +490,20 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1qr2mkm2i3m76zarvy7qgjl9596hmvjrg7x6w42vx8cfsbf5p0y1";
+      sha256 = "1lva6bkvb4mfa0m3bqn4lm4s4gi81c40jvdcsrxr6vng49q9daih";
      type = "gem";
    };
-    version = "1.3.1";
+    version = "1.3.3";
  };
  multipart-post = {
+    groups = ["default"];
+    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+      sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj";
      type = "gem";
    };
-    version = "2.0.0";
+    version = "2.1.1";
  };
  nokogiri = {
    dependencies = ["mini_portile2"];
@ -507,10 +511,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";
+      sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2";
      type = "gem";
    };
-    version = "1.10.9";
+    version = "1.10.10";
  };
  nokogumbo = {
    dependencies = ["nokogiri"];
@ -532,12 +536,14 @@
    version = "0.5.0";
  };
  optimist = {
+    groups = ["default"];
+    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "05jxrp3nbn5iilc1k7ir90mfnwc5abc9h78s5rpm3qafwqxvcj4j";
+      sha256 = "1vg2chy1cfmdj6c1gryl8zvjhhmb3plwgyh1jfnpq4fnfqv7asrk";
      type = "gem";
    };
-    version = "3.0.0";
+    version = "3.0.1";
  };
  parallel = {
    groups = ["default" "development" "test"];
@ -647,12 +653,14 @@
  };
  rbtrace = {
    dependencies = ["ffi" "msgpack" "optimist"];
+    groups = ["default"];
+    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1lwsq08i0aj8na5q5ba3gg02sx3wl58fi6m52svl5p7cy56ycdwi";
+      sha256 = "0s8prj0klfgpmpfcpdzbf149qrrsdxgnb6w6kkqc9gyars4vyaqn";
      type = "gem";
    };
-    version = "0.4.11";
+    version = "0.4.14";
  };
  rdoc = {
    groups = ["default"];
@ -679,10 +687,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "102rc07d78k5bkl0s9nd1gw6wz0w0zcvg4g5sl7z9xxi4r793c35";
+      sha256 = "1r5npy9a95qh5v74lw7ir3nhaq4xrzyhfdixd7c5xy295i92nnic";
      type = "gem";
    };
-    version = "3.19.0";
+    version = "3.20.0";
  };
  rspec = {
    dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
@ -803,10 +811,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1j9rwbig24ry0smgvmkzdjrzyszniaswipinvflzxzzaz52v7483";
+      sha256 = "17j4br2lpnd8066d50mkg9kwk9v70hn3zfiqkvysd8p9nffmqnm0";
      type = "gem";
    };
-    version = "2.9.0";
+    version = "3.0.4";
  };
  simplecov = {
    dependencies = ["docile" "json" "simplecov-html"];
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
@ -2,12 +2,12 @@

 buildGoPackage rec {
  pname = "gitlab-shell";
-  version = "13.2.0";
+  version = "13.7.0";
  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitlab-shell";
    rev = "v${version}";
-    sha256 = "0drdpg4nmhzrmy8sl1f3hcd1278bpapgf0wmhi94xlyayh47j53a";
+    sha256 = "1gh3rwnd6688v7q07g2y69fdz2nyy7disjqifvbl7z1cpfw4h45b";
  };

  buildInputs = [ ruby ];
@ -17,6 +17,10 @@ buildGoPackage rec {
  goPackagePath = "gitlab.com/gitlab-org/gitlab-shell";
  goDeps = ./deps.nix;

+  preBuild = ''
+    rm -rf "$NIX_BUILD_TOP/go/src/gitlab.com/gitlab-org/labkit/vendor"
+  '';
+
  postInstall = ''
    cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $out/bin
    cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $out/
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
--- a/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/gitlab-shell/remove-hardcoded-locations.patch
@ -30,18 +30,18 @@ index 2231851..c869930 100644
 
 func newFromFile(filename string) (*Config, error) {
 diff --git a/internal/keyline/key_line.go b/internal/keyline/key_line.go
-index c29a320..c44b701 100644
+index e2abb82..7e9c481 100644
 --- a/internal/keyline/key_line.go
 +++ b/internal/keyline/key_line.go
-@@ -36,7 +36,7 @@ func NewPrincipalKeyLine(keyId string, principal string, rootDir string) (*KeyLi
- }
- 
+@@ -38,7 +38,7 @@ func NewPrincipalKeyLine(keyId, principal string, config *config.Config) (*KeyLi
+
 func (k *KeyLine) ToString() string {
-	command := fmt.Sprintf("%s %s-%s", path.Join(k.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.Id)
+ 	sslCertDirEnvVar := k.sslCertDirEnvVar()
+-	command := fmt.Sprintf("%s %s-%s", path.Join(k.Config.RootDir, executable.BinDir, executable.GitlabShell), k.Prefix, k.Id)
 +	command := fmt.Sprintf("%s %s-%s", path.Join("/run/current-system/sw/bin", executable.GitlabShell), k.Prefix, k.Id)
- 
- 	return fmt.Sprintf(`command="%s",%s %s`, command, SshOptions, k.Value)
- }
+
+ 	if sslCertDirEnvVar != "" {
+ 		sslCertDirEnvVar = fmt.Sprintf(`%s `, sslCertDirEnvVar)
 diff --git a/support/gitlab_config.rb b/support/gitlab_config.rb
 index 52ac5ee..d96baa3 100644
 --- a/support/gitlab_config.rb
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@ -3,13 +3,13 @@
 buildGoPackage rec {
  pname = "gitlab-workhorse";

-  version = "8.31.2";
+  version = "8.46.0";

  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitlab-workhorse";
    rev = "v${version}";
-    sha256 = "0wvhhjfb490mjdrmc9xwr3qfh3941xn3b02c757ghrvzwv329wvg";
+    sha256 = "1qhaln1k6vcjzphmxdqhwz1cwdx77gclyq0b2ibzgy7xg9l91n99";
  };

  goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse";
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/deps.nix
--- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
@ -34,12 +34,12 @@ diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.
 index 0bea8a4f4b..290248547b 100644
 --- a/config/initializers/1_settings.rb
 +++ b/config/initializers/1_settings.rb
-@@ -255,7 +255,7 @@ Settings.gitlab['user']       ||= 'git'
- Settings.gitlab['user_home']  ||= begin
+@@ -177,7 +177,7 @@ Settings.gitlab['ssh_user'] ||= Settings.gitlab['user']
+ Settings.gitlab['user_home'] ||= begin
   Etc.getpwnam(Settings.gitlab['user']).dir
- rescue ArgumentError # no user configured
-  '/home/' + Settings.gitlab['user']
-+  '/homeless-shelter'
+                                  rescue ArgumentError # no user configured
+-                                   '/home/' + Settings.gitlab['user']
+                                   '/homeless-shelter'
 end
 Settings.gitlab['time_zone'] ||= nil
 Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil?
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@ -1,6 +1,6 @@
 source 'https://rubygems.org'

-gem 'rails', '~> 6.0.3'
+gem 'rails', '~> 6.0.3.1'

 gem 'bootsnap', '~> 1.4.6'

@ -19,15 +19,15 @@ gem 'default_value_for', '~> 3.3.0'
 gem 'pg', '~> 1.1'

 gem 'rugged', '~> 0.28'
-gem 'grape-path-helpers', '~> 1.2'
+gem 'grape-path-helpers', '~> 1.3'

-gem 'faraday', '~> 0.12'
-gem 'marginalia', '~> 1.8.0'
+gem 'faraday', '~> 1.0'
+gem 'marginalia', '~> 1.9.0'

 # Authentication libraries
 gem 'devise', '~> 4.6'
-gem 'doorkeeper', '~> 5.0.3'
-gem 'doorkeeper-openid_connect', '~> 1.6.3'
+gem 'doorkeeper', '~> 5.3.0'
+gem 'doorkeeper-openid_connect', '~> 1.7.4'
 gem 'omniauth', '~> 1.8'
 gem 'omniauth-auth0', '~> 2.0.0'
 gem 'omniauth-azure-oauth2', '~> 0.0.9'
@ -41,11 +41,11 @@ gem 'omniauth-oauth2-generic', '~> 0.2.2'
 gem 'omniauth-saml', '~> 1.10'
 gem 'omniauth-shibboleth', '~> 1.3.0'
 gem 'omniauth-twitter', '~> 1.4'
-gem 'omniauth_crowd', '~> 2.2.0'
+gem 'omniauth_crowd', '~> 2.4.0'
 gem 'omniauth-authentiq', '~> 0.3.3'
-gem 'omniauth_openid_connect', '~> 0.3.3'
-gem "omniauth-ultraauth", '~> 0.0.2'
+gem 'omniauth_openid_connect', '~> 0.3.5'
 gem 'omniauth-salesforce', '~> 1.0.5'
+gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
 gem 'rack-oauth2', '~> 1.9.3'
 gem 'jwt', '~> 2.1.0'

@ -64,13 +64,13 @@ gem 'attr_encrypted', '~> 3.1.0'
 gem 'u2f', '~> 0.2.1'

 # GitLab Pages
-gem 'validates_hostname', '~> 1.0.6'
+gem 'validates_hostname', '~> 1.0.10'
 gem 'rubyzip', '~> 2.0.0', require: 'zip'
 # GitLab Pages letsencrypt support
-gem 'acme-client', '~> 2.0.5'
+gem 'acme-client', '~> 2.0', '>= 2.0.6'

 # Browser detection
-gem 'browser', '~> 2.5'
+gem 'browser', '~> 4.2'

 # GPG
 gem 'gpgme', '~> 2.0.19'
@ -82,17 +82,19 @@ gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
 gem 'net-ldap'

 # API
-gem 'grape', '~> 1.1.0'
+# Locked at Grape v1.4.0 until https://github.com/ruby-grape/grape/pull/2088 is merged
+# Remove config/initializers/grape_patch.rb
+gem 'grape', '= 1.4.0'
 gem 'grape-entity', '~> 0.7.1'
 gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'

 # GraphQL API
-gem 'graphql', '~> 1.10.5'
+gem 'graphql', '~> 1.11.4'
 # 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 'apollo_upload_server', '~> 2.0.0.beta3'
+gem 'apollo_upload_server', '~> 2.0.2'
 gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]

 # Disable strong_params so that Mash does not respond to :permitted?
@ -113,14 +115,15 @@ 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.
 gem 'fog-core', '= 2.1.0'
-gem 'fog-google', '~> 1.9'
+gem 'fog-google', '~> 1.10'
 gem 'fog-local', '~> 0.6'
 gem 'fog-openstack', '~> 1.0'
 gem 'fog-rackspace', '~> 0.1.1'
 gem 'fog-aliyun', '~> 0.3'
+gem 'gitlab-fog-azure-rm', '~> 1.0', require: false

 # for Google storage
-gem 'google-api-client', '~> 0.23'
+gem 'google-api-client', '~> 0.33'

 # for aws storage
 gem 'unf', '~> 0.1.4'
@ -131,9 +134,11 @@ gem 'seed-fu', '~> 2.3.7'
 # Search
 gem 'elasticsearch-model', '~> 6.1'
 gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation'
-gem 'elasticsearch-api',   '~> 6.8'
-gem 'aws-sdk'
-gem 'faraday_middleware-aws-signers-v4'
+gem 'elasticsearch-api',   '~> 6.8.2'
+gem 'aws-sdk-core', '~> 3'
+gem 'aws-sdk-cloudformation', '~> 1'
+gem 'aws-sdk-s3', '~> 1'
+gem 'faraday_middleware-aws-sigv4', '~>0.3.0'

 # Markdown and HTML processing
 gem 'html-pipeline', '~> 2.12'
@ -141,6 +146,7 @@ gem 'deckar01-task_list', '2.3.1'
 gem 'gitlab-markup', '~> 1.7.1'
 gem 'github-markup', '~> 1.7.0', require: 'github/markup'
 gem 'commonmarker', '~> 0.20'
+gem 'kramdown', '~> 2.3.0'
 gem 'RedCloth', '~> 4.3.2'
 gem 'rdoc', '~> 6.1.2'
 gem 'org-ruby', '~> 0.9.12'
@ -149,7 +155,7 @@ gem 'wikicloth', '0.8.1'
 gem 'asciidoctor', '~> 2.0.10'
 gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
 gem 'asciidoctor-plantuml', '~> 0.0.12'
-gem 'rouge', '~> 3.19.0'
+gem 'rouge', '~> 3.21.0'
 gem 'truncato', '~> 0.7.11'
 gem 'bootstrap_form', '~> 4.2.0'
 gem 'nokogiri', '~> 1.10.9'
@ -164,6 +170,8 @@ gem 'diff_match_patch', '~> 0.1.0'

 # Application server
 gem 'rack', '~> 2.0.9'
+# https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
+gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'

 group :unicorn do
  gem 'unicorn', '~> 5.5'
@ -173,7 +181,6 @@ end
 group :puma do
  gem 'gitlab-puma', '~> 4.3.3.gitlab.2', require: false
  gem 'gitlab-puma_worker_killer', '~> 0.1.1.gitlab.1', require: false
-  gem 'rack-timeout', require: false
 end

 # State machine
@ -185,7 +192,7 @@ gem 'acts-as-taggable-on', '~> 6.0'
 # Background jobs
 gem 'sidekiq', '~> 5.2.7'
 gem 'sidekiq-cron', '~> 1.0'
-gem 'redis-namespace', '~> 1.6.0'
+gem 'redis-namespace', '~> 1.7.0'
 gem 'gitlab-sidekiq-fetcher', '0.5.2', require: 'sidekiq-reliable-fetch'

 # Cron Parser
@ -211,7 +218,7 @@ gem 're2', '~> 1.2.0'
 gem 'version_sorter', '~> 2.2.4'

 # Export Ruby Regex to Javascript
-gem 'js_regex', '~> 3.1'
+gem 'js_regex', '~> 3.4'

 # User agent parsing
 gem 'device_detector'
@ -243,7 +250,7 @@ gem 'slack-messenger', '~> 2.3.3'
 gem 'hangouts-chat', '~> 0.0.5'

 # Asana integration
-gem 'asana', '~> 0.9'
+gem 'asana', '0.10.2'

 # FogBugz integration
 gem 'ruby-fogbugz', '~> 0.2.1'
@ -252,7 +259,7 @@ gem 'ruby-fogbugz', '~> 0.2.1'
 gem 'kubeclient', '~> 4.6.0'

 # Sanitize user input
-gem 'sanitize', '~> 4.6'
+gem 'sanitize', '~> 5.2.1'
 gem 'babosa', '~> 1.0.2'

 # Sanitizes SVG input
@ -296,19 +303,19 @@ gem "gitlab-license", "~> 1.0"
 gem 'rack-attack', '~> 6.3.0'

 # Sentry integration
-gem 'sentry-raven', '~> 2.9'
+gem 'sentry-raven', '~> 3.0'

 gem 'premailer-rails', '~> 1.10.3'

 # LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '0.12.0'
+gem 'gitlab-labkit', '0.12.1'

 # I18n
 gem 'ruby_parser', '~> 3.8', require: false
 gem 'rails-i18n', '~> 6.0'
 gem 'gettext_i18n_rails', '~> 1.8.0'
 gem 'gettext_i18n_rails_js', '~> 1.3'
-gem 'gettext', '~> 3.2.2', require: false, group: :development
+gem 'gettext', '~> 3.3', require: false, group: :development

 gem 'batch-loader', '~> 1.4.0'

@ -320,31 +327,29 @@ gem 'snowplow-tracker', '~> 0.6.1'

 # Metrics
 group :metrics do
-  gem 'method_source', '~> 0.8', require: false
+  gem 'method_source', '~> 1.0', require: false

  # Prometheus
-  gem 'prometheus-client-mmap', '~> 0.10.0'
+  gem 'prometheus-client-mmap', '~> 0.11.0'
  gem 'raindrops', '~> 0.18'
 end

 group :development do
  gem 'brakeman', '~> 4.2', require: false
-  gem 'danger', '~> 6.0', require: false
+  gem 'danger', '~> 8.0', require: false

  gem 'letter_opener_web', '~> 1.3.4'
-  gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false

  # Better errors handler
-  gem 'better_errors', '~> 2.5.0'
-  gem 'binding_of_caller', '~> 0.8.0'
+  gem 'better_errors', '~> 2.7.1'

  # thin instead webrick
  gem 'thin', '~> 1.7.0'
 end

 group :development, :test do
-  gem 'bullet', '~> 6.0.2', require: !!ENV['ENABLE_BULLET']
-  gem 'pry-byebug', '~> 3.5.1', platform: :mri
+  gem 'bullet', '~> 6.1.0'
+  gem 'pry-byebug', '~> 3.9.0', platform: :mri
  gem 'pry-rails', '~> 0.3.9'

  gem 'awesome_print', require: false
@ -362,15 +367,16 @@ group :development, :test do
  gem 'spring', '~> 2.0.0'
  gem 'spring-commands-rspec', '~> 1.0.4'

-  gem 'gitlab-styles', '~> 3.2.0', require: false
+  gem 'gitlab-styles', '~> 4.3.0', require: false
  # Pin these dependencies, otherwise a new rule could break the CI pipelines
-  gem 'rubocop', '~> 0.74.0'
-  gem 'rubocop-performance', '~> 1.4.1'
+  gem 'rubocop', '~> 0.82.0'
+  gem 'rubocop-performance', '~> 1.5.2'
  gem 'rubocop-rspec', '~> 1.37.0'

  gem 'scss_lint', '~> 0.56.0', require: false
  gem 'haml_lint', '~> 0.34.0', require: false
  gem 'simplecov', '~> 0.18.5', require: false
+  gem 'simplecov-cobertura', '~> 1.3.1', require: false
  gem 'bundler-audit', '~> 0.6.1', require: false

  gem 'benchmark-ips', '~> 2.3.0', require: false
@ -384,6 +390,8 @@ group :development, :test do
  gem 'png_quantizator', '~> 0.2.1', require: false

  gem 'parallel', '~> 1.19', require: false
+
+  gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
 end

 # Gems required in omnibus-gitlab pipeline
@ -397,17 +405,16 @@ group :test do
  gem 'rspec_profiling', '~> 0.0.5'
  gem 'rspec-parameterized', require: false

-  gem 'capybara', '~> 3.22.0'
+  gem 'capybara', '~> 3.33.0'
  gem 'capybara-screenshot', '~> 1.0.22'
  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 'rails-controller-testing'
  gem 'concurrent-ruby', '~> 1.1'
-  gem 'test-prof', '~> 0.10.0'
+  gem 'test-prof', '~> 0.12.0'
  gem 'rspec_junit_formatter'
  gem 'guard-rspec'

@ -418,7 +425,7 @@ end
 gem 'octokit', '~> 4.15'

 # https://gitlab.com/gitlab-org/gitlab/issues/207207
-gem 'gitlab-mail_room', '~> 0.0.4', require: 'mail_room'
+gem 'gitlab-mail_room', '~> 0.0.6', require: 'mail_room'

 gem 'email_reply_trimmer', '~> 0.1'
 gem 'html2text'
@ -434,7 +441,7 @@ gem 'activerecord-explain-analyze', '~> 0.1', require: false
 gem 'oauth2', '~> 1.4'

 # Health check
-gem 'health_check', '~> 2.6.0'
+gem 'health_check', '~> 3.0'

 # System information
 gem 'vmstat', '~> 2.3.0'
@ -454,11 +461,11 @@ group :ed25519 do
 end

 # Gitaly GRPC protocol definitions
-gem 'gitaly', '~> 13.0.0.pre.rc1'
+gem 'gitaly', '~> 13.3.0-rc1'

-gem 'grpc', '~> 1.24.0'
+gem 'grpc', '~> 1.30.2'

-gem 'google-protobuf', '~> 3.8.0'
+gem 'google-protobuf', '~> 3.12'

 gem 'toml-rb', '~> 1.0.0'

@ -498,3 +505,10 @@ gem 'valid_email', '~> 0.1'

 # JSON
 gem 'json', '~> 2.3.0'
+gem 'json-schema', '~> 2.8.0'
+gem 'json_schemer', '~> 0.2.12'
+gem 'oj', '~> 3.10.6'
+gem 'multi_json', '~> 1.14.1'
+gem 'yajl-ruby', '~> 1.4.1', require: 'yajl'
+
+gem 'webauthn', '~> 2.3'
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
--- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix
+++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix