gitlab: 13.5.1 -> 13.6.0

Changed ruby version to 2.7.x to match upstream. Added a gem config for gitlab-pg_query as it tries to download a source tarball during the build process. Also removed a patch for gitaly that has become obsolete by upstream fix [here](de04077c25).
4 years ago · 2429d5a307
parent 0f82bd767b
commit 2429d5a307
17 changed files with 505 additions and 471 deletions
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@ -1,13 +1,13 @@
 {
-  "version": "13.5.1",
-  "repo_hash": "1mb2kyyf5bczm93qn4nj3fqjgncsq98rr3414wx52lhcf4gl5w00",
+  "version": "13.6.0",
+  "repo_hash": "1flri1cgx8drwf46x4sja366aiiif0ww807xrrcxa05pxj0mx8k5",
  "owner": "gitlab-org",
  "repo": "gitlab",
-  "rev": "v13.5.1-ee",
+  "rev": "v13.6.0-ee",
  "passthru": {
-    "GITALY_SERVER_VERSION": "13.5.1",
-    "GITLAB_PAGES_VERSION": "1.28.0",
-    "GITLAB_SHELL_VERSION": "13.11.0",
-    "GITLAB_WORKHORSE_VERSION": "8.51.0"
+    "GITALY_SERVER_VERSION": "13.6.0",
+    "GITLAB_PAGES_VERSION": "1.30.0",
+    "GITLAB_SHELL_VERSION": "13.13.0",
+    "GITLAB_WORKHORSE_VERSION": "8.54.0"
  }
 }
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
@ -1,8 +1,5 @@
 source 'https://rubygems.org'

-# Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537
-gem 'bundler', '>= 1.17.3'
-
 gem 'rugged', '~> 0.28'
 gem 'github-linguist', '~> 7.11', require: 'linguist'
 gem 'gitlab-markup', '~> 1.7.1'
@ -16,7 +13,7 @@ gem 'faraday', '~> 1.0'
 gem 'rbtrace', require: false

 # Labkit provides observability functionality
-gem 'gitlab-labkit', '~> 0.12.0'
+gem 'gitlab-labkit', '~> 0.13.2'

 # Detects the open source license the repository includes
 # This version needs to be in sync with GitLab CE/EE
@ -33,10 +30,4 @@ group :development, :test do
  gem 'pry', '~> 0.12.2', require: false

  gem 'grpc-tools', '= 1.30.2'
-
-  # gitlab-shell spec gems
-  gem 'listen', '~> 0.5.0'
-  gem 'simplecov', '~> 0.17.1', require: false
-  gem 'vcr', '~> 4.0.0'
-  gem 'webmock', '~> 3.4.0'
 end
--- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
@ -24,9 +24,7 @@ GEM
    adamantium (0.2.0)
      ice_nine (~> 0.11.0)
      memoizable (~> 0.4.0)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    ast (2.4.0)
+    ast (2.4.1)
    binding_ninja (0.2.3)
    builder (3.2.4)
    charlock_holmes (0.7.7)
@ -35,11 +33,8 @@ GEM
      adamantium (~> 0.2.0)
      equalizer (~> 0.0.9)
    concurrent-ruby (1.1.7)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
    crass (1.0.6)
    diff-lcs (1.3)
-    docile (1.3.2)
    equalizer (0.0.11)
    erubi (1.9.0)
    escape_utils (1.2.1)
@ -67,11 +62,11 @@ GEM
    gitlab-gollum-rugged_adapter (0.4.4.2)
      mime-types (>= 1.15)
      rugged (~> 0.25)
-    gitlab-labkit (0.12.0)
+    gitlab-labkit (0.13.2)
      actionpack (>= 5.0.0, < 6.1.0)
      activesupport (>= 5.0.0, < 6.1.0)
      grpc (~> 1.19)
-      jaeger-client (~> 0.10)
+      jaeger-client (~> 1.1)
      opentracing (~> 0.4)
      redis (> 3.0.0, < 5.0.0)
    gitlab-markup (1.7.1)
@ -82,17 +77,15 @@ GEM
      google-protobuf (~> 3.12)
      googleapis-common-protos-types (~> 1.0)
    grpc-tools (1.30.2)
-    hashdiff (0.3.9)
    i18n (1.8.5)
      concurrent-ruby (~> 1.0)
    ice_nine (0.11.2)
-    jaeger-client (0.10.0)
+    jaeger-client (1.1.0)
      opentracing (~> 0.3)
      thrift
    json (2.3.1)
    licensee (8.9.2)
      rugged (~> 0.24)
-    listen (0.5.3)
    loofah (2.7.0)
      crass (~> 1.0.2)
      nokogiri (>= 1.5.9)
@ -114,8 +107,8 @@ GEM
    opentracing (0.5.0)
    optimist (3.0.1)
    parallel (1.19.2)
-    parser (2.7.0.5)
-      ast (~> 2.4.0)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
    proc_to_ast (0.1.0)
      coderay
      parser
@ -124,7 +117,6 @@ GEM
    pry (0.12.2)
      coderay (~> 1.1.0)
      method_source (~> 0.9.0)
-    public_suffix (3.0.3)
    rack (2.2.3)
    rack-test (1.1.0)
      rack (>= 1.0, < 3)
@ -175,18 +167,12 @@ GEM
      parser (>= 2.7.0.1)
    ruby-progressbar (1.10.1)
    rugged (0.28.4.1)
-    safe_yaml (1.0.5)
    sanitize (4.6.6)
      crass (~> 1.0.2)
      nokogiri (>= 1.4.4)
      nokogumbo (~> 1.4)
    sentry-raven (3.0.4)
      faraday (>= 1.0)
-    simplecov (0.17.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
    stringex (2.8.5)
    thread_safe (0.3.6)
    thrift (0.11.0.0)
@ -202,11 +188,6 @@ GEM
      equalizer (~> 0.0.9)
      parser (>= 2.6.5)
      procto (~> 0.0.2)
-    vcr (4.0.0)
-    webmock (3.4.2)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
    zeitwerk (2.4.0)

 PLATFORMS
@ -214,19 +195,17 @@ PLATFORMS

 DEPENDENCIES
  activesupport (~> 6.0.3.3)
-  bundler (>= 1.17.3)
  factory_bot
  faraday (~> 1.0)
  github-linguist (~> 7.11)
  gitlab-gollum-lib (~> 4.2.7.9)
  gitlab-gollum-rugged_adapter (~> 0.4.4.2)
-  gitlab-labkit (~> 0.12.0)
+  gitlab-labkit (~> 0.13.2)
  gitlab-markup (~> 1.7.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)
  rbtrace
  rdoc (~> 6.0)
@ -235,10 +214,7 @@ DEPENDENCIES
  rubocop (~> 0.69)
  rugged (~> 0.28)
  sentry-raven (~> 3.0)
-  simplecov (~> 0.17.1)
  timecop
-  vcr (~> 4.0.0)
-  webmock (~> 3.4.0)

 BUNDLED WITH
   2.1.4
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@ -19,22 +19,16 @@ let
      };
  };
 in buildGoPackage rec {
-  version = "13.5.1";
+  version = "13.6.0";
  pname = "gitaly";

  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitaly";
    rev = "v${version}";
-    sha256 = "1vkifmp56lkgj178na7pqd5h9yxffcy78yaz7ykd4rmgi4c8ayk8";
+    sha256 = "1b3vjg5sxrg8cfxn1nh8j26h847kxrfnn2chbb5v3ivhp1kp6zh2";
  };

-  # Fix a check which assumes that hook files are writeable by their
-  # owner.
-  patches = [
-    ./fix-executable-check.patch
-  ];
-
  goPackagePath = "gitlab.com/gitlab-org/gitaly";

  passthru = {
@ -48,7 +42,7 @@ in buildGoPackage rec {

  postInstall = ''
    mkdir -p $ruby
-    cp -rv $src/ruby/{bin,lib,proto,git-hooks,gitlab-shell} $ruby
+    cp -rv $src/ruby/{bin,lib,proto,git-hooks} $ruby
  '';

  outputs = [ "out" "ruby" ];
--- a/pkgs/applications/version-management/gitlab/gitaly/deps.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/deps.nix
@ -428,8 +428,8 @@
    fetch = {
      type = "git";
      url = "https://github.com/getsentry/raven-go";
-      rev = "v0.1.2";
-      sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z";
+      rev = "v0.2.0";
+      sha256 = "0imfwmsb72168fqandf2lxhzhngf2flxhzaar8hcnnfjv2a291lf";
    };
  }
  {
@ -437,8 +437,8 @@
    fetch = {
      type = "git";
      url = "https://github.com/getsentry/sentry-go";
-      rev = "v0.5.1";
-      sha256 = "1kfn0gcb4c6amhagv04ydpl6p9cqw7f0lxas688a0rf89iwdzz89";
+      rev = "v0.7.0";
+      sha256 = "13n9r7845wsq9z61rbvlqjjjg4aifplc74v3kv0i1lys2fw8a5k9";
    };
  }
  {
@ -1395,6 +1395,15 @@
      sha256 = "11zbhg4kds5idsya04bwz4plj0mmiigypzppzih731ppbk2ms1zg";
    };
  }
+  {
+    goPackagePath = "github.com/oklog/ulid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/oklog/ulid";
+      rev = "v2.0.2";
+      sha256 = "1apm4r23kxsm0c9hlxsr7xh6xwrk2cjqylbpxd4ffxbl6bwflja0";
+    };
+  }
  {
    goPackagePath = "github.com/olekukonko/tablewriter";
    fetch = {
@ -1436,8 +1445,8 @@
    fetch = {
      type = "git";
      url = "https://github.com/opentracing/opentracing-go";
-      rev = "v1.0.2";
-      sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9";
+      rev = "v1.2.0";
+      sha256 = "04rgdwl29kimp2wnm4dycnzp7941hvpj6wym85x23c6fclacm94h";
    };
  }
  {
@ -1467,6 +1476,15 @@
      sha256 = "0kfc95jc2hfgwzcpdfa5hrxgj7s6rzx5jc0n1sn863bsngx2q1ca";
    };
  }
+  {
+    goPackagePath = "github.com/pborman/getopt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pborman/getopt";
+      rev = "7148bc3a4c30";
+      sha256 = "0zhvvmv671r1fbdd5hbv3flx8k2rb60giqx115w0553c56qkqfpj";
+    };
+  }
  {
    goPackagePath = "github.com/pelletier/go-toml";
    fetch = {
@ -1634,8 +1652,8 @@
    fetch = {
      type = "git";
      url = "https://github.com/sirupsen/logrus";
-      rev = "v1.6.0";
-      sha256 = "1zf9is1yxxnna0d1pyag2m9ziy3l27zb2j92p9msm1gx5jjrvzzj";
+      rev = "v1.7.0";
+      sha256 = "1a59pw7zimvm8k423iq9l4f4qjj1ia1xc6pkmhwl2mxc46y2n442";
    };
  }
  {
@ -1733,8 +1751,8 @@
    fetch = {
      type = "git";
      url = "https://github.com/stretchr/testify";
-      rev = "v1.5.1";
-      sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl";
+      rev = "v1.6.1";
+      sha256 = "1yhiqqzjvi63pf01rgzx68gqkkvjx03fvl5wk30br5l6s81s090l";
    };
  }
  {
@ -1913,8 +1931,8 @@
    fetch = {
      type = "git";
      url = "https://gitlab.com/gitlab-org/gitlab-shell.git";
-      rev = "1a2bfecd2f0e";
-      sha256 = "197b3yn7lp6dbzcgxrj3ns2a839adcfmcwi3h53i1sr6952ciayx";
+      rev = "3f9890ef73dc";
+      sha256 = "1zx7x3g18xzw7fs7cayd20llxabv5r93m2mp6ixgr99ksvi6zix7";
    };
  }
  {
@ -1922,8 +1940,8 @@
    fetch = {
      type = "git";
      url = "https://gitlab.com/gitlab-org/labkit.git";
-      rev = "45895e129029";
-      sha256 = "17adv1gcdg0jiy8i5lr064pm3p9ywq6s0iwh9w4q5pycp4qkmn48";
+      rev = "40dcf811328c";
+      sha256 = "1x22iz53wjg1qps0bnr4lniik09szmy99ny2kb6smjpv9cr6klw7";
    };
  }
  {
@ -2030,8 +2048,8 @@
    fetch = {
      type = "git";
      url = "https://go.googlesource.com/sys";
-      rev = "af09f7315aff";
-      sha256 = "0kr94lzr8ngrc6913j5xh6g4r7g087dbdgnpzi6rjcl0bf8nsr22";
+      rev = "e3ed0017c211";
+      sha256 = "0nz91nxgfcbcxirscdrxcq5a97z5pyz0g0k2chjxx228dz59aw1i";
    };
  }
  {
@ -2250,6 +2268,15 @@
      sha256 = "1md0hlyd9s6myv3663i9l59y74n4xjazifmmyxn43g86fgkc5lzj";
    };
  }
+  {
+    goPackagePath = "gopkg.in/yaml.v3";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v3";
+      rev = "9f266ea9e77c";
+      sha256 = "1bbai3lzb50m0x2vwsdbagrbhvfylj9k1m32hgbqwldqx4p9ay35";
+    };
+  }
  {
    goPackagePath = "honnef.co/go/tools";
    fetch = {
--- a/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch
+++ b/pkgs/applications/version-management/gitlab/gitaly/fix-executable-check.patch
@ -1,13 +0,0 @@
-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
- 	}
- 
-	if fi.Mode()&0755 < 0755 {
-+	if fi.Mode()&0555 < 0555 {
- 		return fmt.Errorf("not executable: %v", path)
- 	}
- 
--- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
@ -49,24 +49,15 @@
    };
    version = "0.2.0";
  };
-  addressable = {
-    dependencies = ["public_suffix"];
+  ast = {
    groups = ["default" "development" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
+      sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a";
      type = "gem";
    };
-    version = "2.6.0";
-  };
-  ast = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
-      type = "gem";
-    };
-    version = "2.4.0";
+    version = "2.4.1";
  };
  binding_ninja = {
    groups = ["default" "development" "test"];
@ -125,15 +116,6 @@
    };
    version = "1.1.7";
  };
-  crack = {
-    dependencies = ["safe_yaml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
-      type = "gem";
-    };
-    version = "0.4.3";
-  };
  crass = {
    groups = ["default"];
    platforms = [];
@ -152,16 +134,6 @@
    };
    version = "1.3";
  };
-  docile = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif";
-      type = "gem";
-    };
-    version = "1.3.2";
-  };
  equalizer = {
    source = {
      remotes = ["https://rubygems.org"];
@ -276,10 +248,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0a63zgjll83b25hiq8m4sk75jci2rj8z46lss0j3bc6zi3pxnzax";
+      sha256 = "0vgd61xdclihifcdivddfs1gipxy1ql0kf9q47k9h0xisscyjhd2";
      type = "gem";
    };
-    version = "0.12.0";
+    version = "0.13.2";
  };
  gitlab-markup = {
    groups = ["default"];
@ -333,16 +305,6 @@
    };
    version = "1.30.2";
  };
-  hashdiff = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1qji49afni3c90zws617x514xi7ik70g2iwngj9skq68mjcq6y4x";
-      type = "gem";
-    };
-    version = "0.3.9";
-  };
  i18n = {
    dependencies = ["concurrent-ruby"];
    groups = ["default" "development" "test"];
@ -368,10 +330,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l";
+      sha256 = "1a2qlkc1hkr5hkj2574l1a63sm04bdx98gfhh9m8vvp6psdrnpnb";
      type = "gem";
    };
-    version = "0.10.0";
+    version = "1.1.0";
  };
  json = {
    groups = ["default" "development" "test"];
@ -392,14 +354,6 @@
    };
    version = "8.9.2";
  };
-  listen = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0inlw7vix61170vjr87h9izhjm5dbby8rbfrf1iryiv7b3kyvkxl";
-      type = "gem";
-    };
-    version = "0.5.3";
-  };
  loofah = {
    dependencies = ["crass" "nokogiri"];
    groups = ["default"];
@ -553,10 +507,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0iirjc36irgwpfb58jdf9gli382cj893y9caqhxas8anpzzlikgc";
+      sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z";
      type = "gem";
    };
-    version = "2.7.0.5";
+    version = "2.7.2.0";
  };
  proc_to_ast = {
    dependencies = ["coderay" "parser" "unparser"];
@ -584,14 +538,6 @@
    };
    version = "0.12.2";
  };
-  public_suffix = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
-      type = "gem";
-    };
-    version = "3.0.3";
-  };
  rack = {
    groups = ["default"];
    platforms = [];
@ -811,16 +757,6 @@
    };
    version = "0.28.4.1";
  };
-  safe_yaml = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56";
-      type = "gem";
-    };
-    version = "1.0.5";
-  };
  sanitize = {
    dependencies = ["crass" "nokogiri" "nokogumbo"];
    source = {
@ -841,27 +777,6 @@
    };
    version = "3.0.4";
  };
-  simplecov = {
-    dependencies = ["docile" "json" "simplecov-html"];
-    groups = ["development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1135k46nik05sdab30yxb8264lqiz01c8v000g16cl9pjc4mxrdw";
-      type = "gem";
-    };
-    version = "0.17.1";
-  };
-  simplecov-html = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn";
-      type = "gem";
-    };
-    version = "0.10.2";
-  };
  stringex = {
    groups = ["default"];
    platforms = [];
@ -930,23 +845,6 @@
    };
    version = "0.4.7";
  };
-  vcr = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qh7lkj9b0shph84dw1wsrlaprl0jn1i4339fpsfy99402290zrr";
-      type = "gem";
-    };
-    version = "4.0.0";
-  };
-  webmock = {
-    dependencies = ["addressable" "crack" "hashdiff"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "03994dxs4xayvkxqp01dd1ivhg4xxx7z35f7cxw7y2mwj3xn24ib";
-      type = "gem";
-    };
-    version = "3.4.2";
-  };
  zeitwerk = {
    groups = ["default" "development" "test"];
    platforms = [];
--- 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.11.0";
+  version = "13.13.0";
  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitlab-shell";
    rev = "v${version}";
-    sha256 = "1m18v5qax14qz0a0ifpl96i4p5caysls33hg93q1x83x1xryxd54";
+    sha256 = "1zx7x3g18xzw7fs7cayd20llxabv5r93m2mp6ixgr99ksvi6zix7";
  };

  buildInputs = [ ruby ];
--- 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.51.0";
+  version = "8.54.0";

  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitlab-workhorse";
    rev = "v${version}";
-    sha256 = "012xbnd4lqfv478bbd2r9jhnb2f162gsa5y77z3by0kqqpsglgl5";
+    sha256 = "0fz00sl9q4d3vbslh7y9nsnhjshgfg0x7mv7b7a9sc3mxmabp7gz";
  };

  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
@ -347,8 +347,8 @@
    fetch = {
      type = "git";
      url = "https://github.com/certifi/gocertifi";
-      rev = "ee1a9a0726d2";
-      sha256 = "08l6lqaw83pva6fa0aafmhmy1mhb145av21772zfh3ij809a37i4";
+      rev = "2c3bb06c6054";
+      sha256 = "00g5jy613nkm96k6ylbcwdwpdhm84mvw2gqr3gmj5mhwmsc8x97p";
    };
  }
  {
@ -671,8 +671,8 @@
    fetch = {
      type = "git";
      url = "https://github.com/getsentry/raven-go";
-      rev = "v0.1.2";
-      sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z";
+      rev = "v0.2.0";
+      sha256 = "0imfwmsb72168fqandf2lxhzhngf2flxhzaar8hcnnfjv2a291lf";
    };
  }
  {
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
@ -19,7 +19,7 @@ gem 'default_value_for', '~> 3.3.0'
 gem 'pg', '~> 1.1'

 gem 'rugged', '~> 0.28'
-gem 'grape-path-helpers', '~> 1.4'
+gem 'grape-path-helpers', '~> 1.5'

 gem 'faraday', '~> 1.0'
 gem 'marginalia', '~> 1.9.0'
@ -48,7 +48,7 @@ gem 'omniauth-authentiq', '~> 0.3.3'
 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 'rack-oauth2', '~> 1.16.0'
 gem 'jwt', '~> 2.1.0'

 # Kerberos authentication. EE-only
@ -98,6 +98,7 @@ gem 'graphql', '~> 1.11.4'
 gem 'graphiql-rails', '~> 1.4.10'
 gem 'apollo_upload_server', '~> 2.0.2'
 gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
+gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)

 gem 'hashie'
 # Disable strong_params so that Mash does not respond to :permitted?
@ -118,7 +119,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.
 gem 'fog-core', '= 2.1.0'
-gem 'fog-google', '~> 1.10'
+gem 'fog-google', '~> 1.11'
 gem 'fog-local', '~> 0.6'
 gem 'fog-openstack', '~> 1.0'
 gem 'fog-rackspace', '~> 0.1.1'
@ -158,7 +159,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.24.0'
+gem 'rouge', '~> 3.25.0'
 gem 'truncato', '~> 0.7.11'
 gem 'bootstrap_form', '~> 4.2.0'
 gem 'nokogiri', '~> 1.10.9'
@ -172,7 +173,7 @@ gem 'diffy', '~> 3.3'
 gem 'diff_match_patch', '~> 0.1.0'

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

@ -271,9 +272,6 @@ gem 'loofah', '~> 2.2'
 # Working with license
 gem 'licensee', '~> 8.9'

-# Ace editor
-gem 'ace-rails-ap', '~> 4.1.0'
-
 # Detect and convert string character encoding
 gem 'charlock_holmes', '~> 0.7.7'

@ -307,13 +305,16 @@ gem 'rack-attack', '~> 6.3.0'
 # Sentry integration
 gem 'sentry-raven', '~> 3.0'

+# PostgreSQL query parsing
+gem 'gitlab-pg_query', '~> 1.3', require: 'pg_query'
+
 gem 'premailer-rails', '~> 1.10.3'

 # LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '0.12.2'
+gem 'gitlab-labkit', '0.13.1'

 # I18n
-gem 'ruby_parser', '~> 3.8', require: false
+gem 'ruby_parser', '~> 3.15', require: false
 gem 'rails-i18n', '~> 6.0'
 gem 'gettext_i18n_rails', '~> 1.8.0'
 gem 'gettext_i18n_rails_js', '~> 1.3'
@ -366,22 +367,19 @@ group :development, :test do
  # Generate Fake data
  gem 'ffaker', '~> 2.10'

-  gem 'spring', '~> 2.0.0'
+  gem 'spring', '~> 2.1.0'
  gem 'spring-commands-rspec', '~> 1.0.4'

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

-  gem 'scss_lint', '~> 0.56.0', require: false
-  gem 'haml_lint', '~> 0.34.0', require: false
+  gem 'scss_lint', '~> 0.59.0', require: false
+  gem 'haml_lint', '~> 0.36.0', require: false
  gem 'bundler-audit', '~> 0.6.1', require: false

  gem 'benchmark-ips', '~> 2.3.0', require: false

  gem 'knapsack', '~> 1.17'
+  gem 'crystalball', '~> 0.7.0', require: false

  gem 'simple_po_parser', '~> 1.1.2', require: false

@ -407,7 +405,7 @@ end
 group :test do
  gem 'fuubar', '~> 2.2.0'
  gem 'rspec-retry', '~> 0.6.1'
-  gem 'rspec_profiling', '~> 0.0.5'
+  gem 'rspec_profiling', '~> 0.0.6'
  gem 'rspec-parameterized', require: false

  gem 'capybara', '~> 3.33.0'
--- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
@ -3,7 +3,6 @@ GEM
  specs:
    RedCloth (4.3.2)
    abstract_type (0.0.7)
-    ace-rails-ap (4.1.2)
    acme-client (2.0.6)
      faraday (>= 0.17, < 2.0.0)
    actioncable (6.0.3.3)
@ -71,7 +70,7 @@ GEM
      memoizable (~> 0.4.0)
    addressable (2.7.0)
      public_suffix (>= 2.0.2, < 5.0)
-    aes_key_wrap (1.0.1)
+    aes_key_wrap (1.1.0)
    akismet (3.0.0)
    android_key_attestation (0.3.0)
    apollo_upload_server (2.0.2)
@ -87,7 +86,7 @@ GEM
      asciidoctor (>= 1.5.6, < 3.0.0)
    asciidoctor-plantuml (0.0.12)
      asciidoctor (>= 1.5.6, < 3.0.0)
-    ast (2.4.0)
+    ast (2.4.1)
    atlassian-jwt (0.2.0)
      jwt (~> 2.1.0)
    attr_encrypted (3.1.0)
@ -133,7 +132,7 @@ GEM
      coderay (>= 1.0.0)
      erubi (>= 1.0.0)
      rack (>= 0.9.0)
-    bindata (2.4.3)
+    bindata (2.4.8)
    binding_ninja (0.2.3)
    bootsnap (1.4.6)
      msgpack (~> 1.0)
@ -199,6 +198,8 @@ GEM
      safe_yaml (~> 1.0.0)
    crass (1.0.6)
    creole (0.5.0)
+    crystalball (0.7.0)
+      git
    css_parser (1.7.0)
      addressable
    daemons (1.2.6)
@ -368,11 +369,12 @@ GEM
      excon (~> 0.58)
      formatador (~> 0.2)
      mime-types
-    fog-google (1.10.0)
+    fog-google (1.11.0)
      fog-core (<= 2.1.0)
      fog-json (~> 1.2)
      fog-xml (~> 0.1.0)
      google-api-client (>= 0.32, < 0.34)
+      google-cloud-env (~> 1.2)
    fog-json (1.2.0)
      fog-core
      multi_json (~> 1.10)
@ -428,17 +430,18 @@ GEM
      fog-json (~> 1.2.0)
      mime-types
      ms_rest_azure (~> 0.12.0)
-    gitlab-labkit (0.12.2)
+    gitlab-labkit (0.13.1)
      actionpack (>= 5.0.0, < 6.1.0)
      activesupport (>= 5.0.0, < 6.1.0)
      grpc (~> 1.19)
-      jaeger-client (~> 0.10)
+      jaeger-client (~> 1.1)
      opentracing (~> 0.4)
      redis (> 3.0.0, < 5.0.0)
    gitlab-license (1.0.0)
    gitlab-mail_room (0.0.7)
    gitlab-markup (1.7.1)
    gitlab-net-dns (0.9.1)
+    gitlab-pg_query (1.3.0)
    gitlab-puma (4.3.5.gitlab.3)
      nio4r (~> 2.0)
    gitlab-puma_worker_killer (0.1.1.gitlab.1)
@ -446,12 +449,12 @@ GEM
      gitlab-puma (>= 2.7, < 5)
    gitlab-sidekiq-fetcher (0.5.2)
      sidekiq (~> 5)
-    gitlab-styles (4.3.0)
-      rubocop (~> 0.82.0)
+    gitlab-styles (5.1.0)
+      rubocop (~> 0.89.1)
      rubocop-gitlab-security (~> 0.1.0)
-      rubocop-performance (~> 1.5.2)
-      rubocop-rails (~> 2.5)
-      rubocop-rspec (~> 1.36)
+      rubocop-performance (~> 1.8.1)
+      rubocop-rails (~> 2.8)
+      rubocop-rspec (~> 1.44)
    gitlab_chronic_duration (0.10.6.2)
      numerizer (~> 0.2)
    gitlab_omniauth-ldap (2.1.1)
@ -473,6 +476,8 @@ GEM
      representable (~> 3.0)
      retriable (>= 2.0, < 4.0)
      signet (~> 0.12)
+    google-cloud-env (1.4.0)
+      faraday (>= 0.17.3, < 2.0)
    google-protobuf (3.12.4)
    googleapis-common-protos-types (1.0.5)
      google-protobuf (~> 3.11)
@ -495,17 +500,24 @@ GEM
    grape-entity (0.7.1)
      activesupport (>= 4.0)
      multi_json (>= 1.3.2)
-    grape-path-helpers (1.4.0)
+    grape-path-helpers (1.5.0)
      activesupport
      grape (~> 1.3)
-      rake (~> 12)
+      rake (> 12)
    grape_logging (1.8.3)
      grape
      rack
    graphiql-rails (1.4.10)
      railties
      sprockets-rails
+    graphlient (0.4.0)
+      faraday (>= 1.0)
+      faraday_middleware
+      graphql-client
    graphql (1.11.4)
+    graphql-client (0.16.0)
+      activesupport (>= 3.0)
+      graphql (~> 1.8)
    graphql-docs (1.6.0)
      commonmarker (~> 0.16)
      escape_utils (~> 1.2)
@ -536,8 +548,9 @@ GEM
    haml (5.1.2)
      temple (>= 0.8.0)
      tilt
-    haml_lint (0.34.0)
-      haml (>= 4.0, < 5.2)
+    haml_lint (0.36.0)
+      haml (>= 4.0, < 5.3)
+      parallel (~> 1.10)
      rainbow
      rubocop (>= 0.50.0)
      sysexits (~> 1.1)
@ -586,10 +599,9 @@ GEM
    invisible_captcha (0.12.1)
      rails (>= 3.2.0)
    ipaddress (0.8.3)
-    jaeger-client (0.10.0)
+    jaeger-client (1.1.0)
      opentracing (~> 0.3)
      thrift
-    jaro_winkler (1.5.4)
    jira-ruby (2.0.0)
      activesupport
      atlassian-jwt
@ -601,7 +613,7 @@ GEM
      regexp_parser (~> 1.5)
      regexp_property_values (~> 0.3)
    json (2.3.0)
-    json-jwt (1.11.0)
+    json-jwt (1.13.0)
      activesupport (>= 4.2)
      aes_key_wrap
      bindata
@ -821,9 +833,9 @@ GEM
      rubypants (~> 0.2)
    orm_adapter (0.5.0)
    os (1.0.0)
-    parallel (1.19.1)
-    parser (2.7.1.2)
-      ast (~> 2.4.0)
+    parallel (1.19.2)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
    parslet (1.8.2)
    peek (1.1.0)
      railties (>= 4.0.0)
@ -855,19 +867,19 @@ GEM
    public_suffix (4.0.6)
    pyu-ruby-sasl (0.0.3.3)
    raabro (1.1.6)
-    rack (2.1.4)
+    rack (2.2.3)
    rack-accept (0.4.5)
      rack (>= 0.4)
    rack-attack (6.3.0)
      rack (>= 1.0, < 3)
    rack-cors (1.0.6)
      rack (>= 1.6.0)
-    rack-oauth2 (1.9.3)
+    rack-oauth2 (1.16.0)
      activesupport
      attr_required
      httpclient
-      json-jwt (>= 1.9.0)
-      rack
+      json-jwt (>= 1.11.0)
+      rack (>= 2.1.0)
    rack-protection (2.0.5)
      rack
    rack-proxy (0.6.0)
@ -910,7 +922,7 @@ GEM
      thor (>= 0.20.3, < 2.0)
    rainbow (3.0.0)
    raindrops (0.19.1)
-    rake (12.3.3)
+    rake (13.0.1)
    rb-fsevent (0.10.4)
    rb-inotify (0.10.1)
      ffi (~> 1.0)
@ -945,7 +957,7 @@ GEM
      redis-store (>= 1.2, < 2)
    redis-store (1.8.1)
      redis (>= 4, < 5)
-    regexp_parser (1.5.1)
+    regexp_parser (1.8.2)
    regexp_property_values (0.3.5)
    representable (3.0.4)
      declarative (< 0.1.0)
@ -965,7 +977,7 @@ GEM
    rexml (3.2.4)
    rinku (2.0.0)
    rotp (2.1.2)
-    rouge (3.24.0)
+    rouge (3.25.0)
    rqrcode (0.7.0)
      chunky_png
    rqrcode-rails3 (0.1.7)
@ -1001,29 +1013,34 @@ GEM
    rspec-support (3.9.2)
    rspec_junit_formatter (0.4.1)
      rspec-core (>= 2, < 4, != 2.12.0)
-    rspec_profiling (0.0.5)
+    rspec_profiling (0.0.6)
      activerecord
      pg
      rails
      sqlite3
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (0.89.1)
      parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)
      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
      rexml
+      rubocop-ast (>= 0.3.0, < 1.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.8.0)
+      parser (>= 2.7.1.5)
    rubocop-gitlab-security (0.1.1)
      rubocop (>= 0.51)
-    rubocop-performance (1.5.2)
-      rubocop (>= 0.71.0)
-    rubocop-rails (2.5.2)
-      activesupport
+    rubocop-performance (1.8.1)
+      rubocop (>= 0.87.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.8.1)
+      activesupport (>= 4.2.0)
      rack (>= 1.1)
-      rubocop (>= 0.72.0)
-    rubocop-rspec (1.37.0)
-      rubocop (>= 0.68.1)
+      rubocop (>= 0.87.0)
+    rubocop-rspec (1.44.1)
+      rubocop (~> 0.87)
+      rubocop-ast (>= 0.7.1)
    ruby-enum (0.7.2)
      i18n
    ruby-fogbugz (0.2.1)
@ -1034,7 +1051,7 @@ GEM
      nokogiri (>= 1.5.10)
    ruby-statistics (2.1.2)
    ruby2_keywords (0.0.2)
-    ruby_parser (3.13.1)
+    ruby_parser (3.15.0)
      sexp_processor (~> 4.9)
    rubyntlm (0.6.2)
    rubypants (0.2.0)
@ -1064,9 +1081,8 @@ GEM
    sawyer (0.8.2)
      addressable (>= 2.3.5)
      faraday (> 0.8, < 2.0)
-    scss_lint (0.56.0)
-      rake (>= 0.9, < 13)
-      sass (~> 3.5.3)
+    scss_lint (0.59.0)
+      sass (~> 3.5, >= 3.5.5)
    securecompare (1.0.0)
    seed-fu (2.3.7)
      activerecord (>= 3.1)
@ -1077,7 +1093,7 @@ GEM
    sentry-raven (3.0.4)
      faraday (>= 1.0)
    settingslogic (2.0.9)
-    sexp_processor (4.12.0)
+    sexp_processor (4.15.1)
    shellany (0.0.1)
    shoulda-matchers (4.0.1)
      activesupport (>= 4.2.0)
@ -1105,8 +1121,7 @@ GEM
    slack-messenger (2.3.4)
    snowplow-tracker (0.6.1)
      contracts (~> 0.7, <= 0.11)
-    spring (2.0.2)
-      activesupport (>= 4.2)
+    spring (2.1.1)
    spring-commands-rspec (1.0.4)
      spring (>= 0.9.1)
    sprockets (3.7.2)
@ -1146,7 +1161,7 @@ GEM
      rack (>= 1, < 3)
    thor (0.20.3)
    thread_safe (0.3.6)
-    thrift (0.11.0.0)
+    thrift (0.13.0)
    tilt (2.0.10)
    timecop (0.9.1)
    timeliness (0.3.10)
@ -1162,7 +1177,7 @@ GEM
    truncato (0.7.11)
      htmlentities (~> 4.3.1)
      nokogiri (>= 1.7.0, <= 2.0)
-    tzinfo (1.2.7)
+    tzinfo (1.2.8)
      thread_safe (~> 0.1)
    u2f (0.2.1)
    uber (0.1.0)
@ -1236,14 +1251,13 @@ GEM
    xpath (3.2.0)
      nokogiri (~> 1.8)
    yajl-ruby (1.4.1)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.1)

 PLATFORMS
  ruby

 DEPENDENCIES
  RedCloth (~> 4.3.2)
-  ace-rails-ap (~> 4.1.0)
  acme-client (~> 2.0, >= 2.0.6)
  activerecord-explain-analyze (~> 0.1)
  acts-as-taggable-on (~> 6.0)
@ -1283,6 +1297,7 @@ DEPENDENCIES
  connection_pool (~> 2.0)
  countries (~> 3.0)
  creole (~> 0.5.0)
+  crystalball (~> 0.7.0)
  danger (~> 8.0.6)
  database_cleaner (~> 1.7.0)
  deckar01-task_list (= 2.3.1)
@ -1316,7 +1331,7 @@ DEPENDENCIES
  fog-aliyun (~> 0.3)
  fog-aws (~> 3.5)
  fog-core (= 2.1.0)
-  fog-google (~> 1.10)
+  fog-google (~> 1.11)
  fog-local (~> 0.6)
  fog-openstack (~> 1.0)
  fog-rackspace (~> 0.1.1)
@ -1331,15 +1346,16 @@ DEPENDENCIES
  github-markup (~> 1.7.0)
  gitlab-chronic (~> 0.10.5)
  gitlab-fog-azure-rm (~> 1.0)
-  gitlab-labkit (= 0.12.2)
+  gitlab-labkit (= 0.13.1)
  gitlab-license (~> 1.0)
  gitlab-mail_room (~> 0.0.7)
  gitlab-markup (~> 1.7.1)
  gitlab-net-dns (~> 0.9.1)
+  gitlab-pg_query (~> 1.3)
  gitlab-puma (~> 4.3.3.gitlab.2)
  gitlab-puma_worker_killer (~> 0.1.1.gitlab.1)
  gitlab-sidekiq-fetcher (= 0.5.2)
-  gitlab-styles (~> 4.3.0)
+  gitlab-styles (~> 5.1.0)
  gitlab_chronic_duration (~> 0.10.6.2)
  gitlab_omniauth-ldap (~> 2.1.1)
  gon (~> 6.2)
@ -1348,15 +1364,16 @@ DEPENDENCIES
  gpgme (~> 2.0.19)
  grape (= 1.4.0)
  grape-entity (~> 0.7.1)
-  grape-path-helpers (~> 1.4)
+  grape-path-helpers (~> 1.5)
  grape_logging (~> 1.7)
  graphiql-rails (~> 1.4.10)
+  graphlient (~> 0.4.0)
  graphql (~> 1.11.4)
  graphql-docs (~> 1.6.0)
  grpc (~> 1.30.2)
  gssapi
  guard-rspec
-  haml_lint (~> 0.34.0)
+  haml_lint (~> 0.36.0)
  hamlit (~> 2.11.0)
  hangouts-chat (~> 0.0.5)
  hashie
@ -1429,10 +1446,10 @@ DEPENDENCIES
  prometheus-client-mmap (~> 0.12.0)
  pry-byebug (~> 3.9.0)
  pry-rails (~> 0.3.9)
-  rack (~> 2.1.4)
+  rack (~> 2.2.3)
  rack-attack (~> 6.3.0)
  rack-cors (~> 1.0.6)
-  rack-oauth2 (~> 1.9.3)
+  rack-oauth2 (~> 1.16.0)
  rack-proxy (~> 0.6.0)
  rack-timeout (~> 0.5.1)
  rails (~> 6.0.3.1)
@ -1451,25 +1468,22 @@ DEPENDENCIES
  request_store (~> 1.5)
  responders (~> 3.0)
  retriable (~> 3.1.2)
-  rouge (~> 3.24.0)
+  rouge (~> 3.25.0)
  rqrcode-rails3 (~> 0.1.7)
  rspec-parameterized
  rspec-rails (~> 4.0.0)
  rspec-retry (~> 0.6.1)
  rspec_junit_formatter
-  rspec_profiling (~> 0.0.5)
-  rubocop (~> 0.82.0)
-  rubocop-performance (~> 1.5.2)
-  rubocop-rspec (~> 1.37.0)
+  rspec_profiling (~> 0.0.6)
  ruby-fogbugz (~> 0.2.1)
  ruby-prof (~> 1.3.0)
  ruby-progressbar
-  ruby_parser (~> 3.8)
+  ruby_parser (~> 3.15)
  rubyzip (~> 2.0.0)
  rugged (~> 0.28)
  sanitize (~> 5.2.1)
  sassc-rails (~> 2.1.0)
-  scss_lint (~> 0.56.0)
+  scss_lint (~> 0.59.0)
  seed-fu (~> 2.3.7)
  selenium-webdriver (~> 3.142)
  sentry-raven (~> 3.0)
@ -1482,7 +1496,7 @@ DEPENDENCIES
  simplecov-cobertura (~> 1.3.1)
  slack-messenger (~> 2.3.4)
  snowplow-tracker (~> 0.6.1)
-  spring (~> 2.0.0)
+  spring (~> 2.1.0)
  spring-commands-rspec (~> 1.0.4)
  sprockets (~> 3.7.0)
  sshkey (~> 2.0)
--- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
@ -9,16 +9,6 @@
    };
    version = "0.0.7";
  };
-  ace-rails-ap = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "14wj9gsiy7rm0lvs27ffsrh92wndjksj6rlfj3n7jhv1v77w9v2h";
-      type = "gem";
-    };
-    version = "4.1.2";
-  };
  acme-client = {
    dependencies = ["faraday"];
    groups = ["default"];
@ -200,10 +190,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0li86k0g812jkzrppb2fvqngvzp09nygywjpn81nx90s01wxqw07";
+      sha256 = "19bn0y70qm6mfj4y1m0j3s8ggh6dvxwrwrj5vfamhdrpddsz8ddr";
      type = "gem";
    };
-    version = "1.0.1";
+    version = "1.1.0";
  };
  akismet = {
    groups = ["default"];
@ -284,10 +274,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
+      sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a";
      type = "gem";
    };
-    version = "2.4.0";
+    version = "2.4.1";
  };
  atlassian-jwt = {
    dependencies = ["jwt"];
@ -525,10 +515,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0kxy917xyxckifmnawff65j7g6yb3wh2s45npjq9lqjbi1p86lsr";
+      sha256 = "1bmlqjb5h1ry6wm2d903d6yxibpqzzxwqczvlicsqv0vilaca5ic";
      type = "gem";
    };
-    version = "2.4.3";
+    version = "2.4.8";
  };
  binding_ninja = {
    groups = ["default" "development" "test"];
@ -882,6 +872,17 @@
    };
    version = "0.5.0";
  };
+  crystalball = {
+    dependencies = ["git"];
+    groups = ["development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1why2py76hv2m7i3a1im3zi5zcjcvz2l1nvshzndlwah58vrywkf";
+      type = "gem";
+    };
+    version = "0.7.0";
+  };
  css_parser = {
    dependencies = ["addressable"];
    groups = ["default"];
@ -1606,15 +1607,15 @@
    version = "2.1.0";
  };
  fog-google = {
-    dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"];
+    dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client" "google-cloud-env"];
    groups = ["default"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "10gwq4lz09386wdl4y9sqkdwy16phs439bfii7vz47s64fvg9gn5";
+      sha256 = "1h9apmm2pyb157pbnrqk37wfs2d9f35navsgzs3kclrxhyl2qm5f";
      type = "gem";
    };
-    version = "1.10.0";
+    version = "1.11.0";
  };
  fog-json = {
    dependencies = ["fog-core" "multi_json"];
@ -1839,10 +1840,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0k9f3a82727bhhhk8sjyjndpx4p5lwk3x03m06h4w59bpxa917sw";
+      sha256 = "0cnrpqswicawhpvd4dh4jcma9d4haznc4gyl37ssvj1jkfhc4w40";
      type = "gem";
    };
-    version = "0.12.2";
+    version = "0.13.1";
  };
  gitlab-license = {
    groups = ["default"];
@ -1884,6 +1885,16 @@
    };
    version = "0.9.1";
  };
+  gitlab-pg_query = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xvzs8gy6vbddzf9kin92lqb99vzwljikfgqvxbxqm7hzl16dilq";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
  gitlab-puma = {
    dependencies = ["nio4r"];
    groups = ["puma"];
@ -1923,10 +1934,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1vw4kbmxiccq7r1ijgccq35cqf34bvy2l5p9chxr2g8hlx5rd4kw";
+      sha256 = "0l24vgcmvval1apqk99c3ifcwlg1fh60vf02ggnc20f65dka81p3";
      type = "gem";
    };
-    version = "4.3.0";
+    version = "5.1.0";
  };
  gitlab_chronic_duration = {
    dependencies = ["numerizer"];
@ -1983,6 +1994,17 @@
    };
    version = "0.33.2";
  };
+  google-cloud-env = {
+    dependencies = ["faraday"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bjgxyvagy6hjj8yg7fqq24rwdjxb6hx7fdd1bmn4mwd846lci2i";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
  google-protobuf = {
    groups = ["default"];
    platforms = [];
@ -2054,10 +2076,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "175a07vv77k1kyilrgkhpr1vdswcywymgrmr4mmp434w17w0hlrg";
+      sha256 = "131s6a0xa0fj7w5d6xb2p2z3404w6rxbc33v7fcg50jrjgqphrjz";
      type = "gem";
    };
-    version = "1.4.0";
+    version = "1.5.0";
  };
  grape_logging = {
    dependencies = ["grape" "rack"];
@ -2081,6 +2103,17 @@
    };
    version = "1.4.10";
  };
+  graphlient = {
+    dependencies = ["faraday" "faraday_middleware" "graphql-client"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04c32rcn3j4d8sh039lkdfzn8xpifsbpsp7f90vlp2s531wbs16a";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
  graphql = {
    groups = ["default" "development" "test"];
    platforms = [];
@ -2091,6 +2124,17 @@
    };
    version = "1.11.4";
  };
+  graphql-client = {
+    dependencies = ["activesupport" "graphql"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0g971rccyrs3rk8812r6az54p28g66m4ngdcbszg31mvddjaqkr4";
+      type = "gem";
+    };
+    version = "0.16.0";
+  };
  graphql-docs = {
    dependencies = ["commonmarker" "escape_utils" "extended-markdown-filter" "gemoji" "graphql" "html-pipeline" "sass"];
    groups = ["development" "test"];
@ -2168,15 +2212,15 @@
    version = "5.1.2";
  };
  haml_lint = {
-    dependencies = ["haml" "rainbow" "rubocop" "sysexits"];
+    dependencies = ["haml" "parallel" "rainbow" "rubocop" "sysexits"];
    groups = ["development" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1iaaa5as4nlblnbvy6pxj8z9k3jqspbh4f43il519f28lgi0llsn";
+      sha256 = "0imdiwxqyca1i158yrqkdv6fa8sdfk8wwx2kaq6ad9i7k7jj365a";
      type = "gem";
    };
-    version = "0.34.0";
+    version = "0.36.0";
  };
  hamlit = {
    dependencies = ["temple" "thor" "tilt"];
@ -2446,20 +2490,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l";
+      sha256 = "1a2qlkc1hkr5hkj2574l1a63sm04bdx98gfhh9m8vvp6psdrnpnb";
      type = "gem";
    };
-    version = "0.10.0";
-  };
-  jaro_winkler = {
-    groups = ["default" "development" "test"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh";
-      type = "gem";
-    };
-    version = "1.5.4";
+    version = "1.1.0";
  };
  jira-ruby = {
    dependencies = ["activesupport" "atlassian-jwt" "multipart-post" "oauth"];
@ -2509,10 +2543,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "18rf9v20i0dk5dblr7m22di959xpch2h7gsx0cl585cryr7apwp3";
+      sha256 = "0nzbk1mrbf9mnvjpn3bxy8a85rjf94qmfdnvk78mjzk8pa0fvgdr";
      type = "gem";
    };
-    version = "1.11.0";
+    version = "1.13.0";
  };
  json-schema = {
    dependencies = ["addressable"];
@ -3538,10 +3572,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2";
+      sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l";
      type = "gem";
    };
-    version = "1.19.1";
+    version = "1.19.2";
  };
  parser = {
    dependencies = ["ast"];
@ -3549,10 +3583,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1xgsl3dvmidvr1y4lp63m5avjxykl2gradgav8xfp5z86rfqhpr0";
+      sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z";
      type = "gem";
    };
-    version = "2.7.1.2";
+    version = "2.7.2.0";
  };
  parslet = {
    groups = ["default" "development" "test"];
@ -3735,10 +3769,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1x72abm2snhk664s9g642pxjyk911y39qck8n9hbnqmb7ba1zbmz";
+      sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16";
      type = "gem";
    };
-    version = "2.1.4";
+    version = "2.2.3";
  };
  rack-accept = {
    dependencies = ["rack"];
@ -3779,10 +3813,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0kmxj9hbjhhcs3yyb433s82hkpmzb536m0mwfadjiaisganx1cii";
+      sha256 = "1b0h0rlfl0p0drymwfc71g87fp66ck3205pl32z89xsgh0lzw25k";
      type = "gem";
    };
-    version = "1.9.3";
+    version = "1.16.0";
  };
  rack-protection = {
    dependencies = ["rack"];
@ -3918,10 +3952,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1cvaqarr1m84mhc006g3l1vw7sa5qpkcw0138lsxlf769zdllsgp";
+      sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9";
      type = "gem";
    };
-    version = "12.3.3";
+    version = "13.0.1";
  };
  rb-fsevent = {
    groups = ["default" "development" "test"];
@ -4112,10 +4146,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0dsgjb3kszk6a82s6gl0h6a8vncjrxmcbk0r4mcxcdcad2b7vb2d";
+      sha256 = "0x4s82lgf0l71y3xc9gp4qxkrgx1kv8f6avdqd68l46ijbyvicdm";
      type = "gem";
    };
-    version = "1.5.1";
+    version = "1.8.2";
  };
  regexp_property_values = {
    groups = ["default"];
@ -4216,10 +4250,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1igl00gk0vaq4xxk44m7yflqdzsblgxlzcxj8saz96bmx7mg7392";
+      sha256 = "0yvcv901lrh5rfnk1h4h56hf2m6n9pd6w8n96vag74aakgz3gaxn";
      type = "gem";
    };
-    version = "3.24.0";
+    version = "3.25.0";
  };
  rqrcode = {
    dependencies = ["chunky_png"];
@ -4343,25 +4377,36 @@
  };
  rspec_profiling = {
    dependencies = ["activerecord" "pg" "rails" "sqlite3"];
-    groups = ["development" "test"];
+    groups = ["test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1g7q7gav26bpiprx4dhlvdh4zdrhwiky9jbmsp14gyfiabqdz4sz";
+      sha256 = "0vkfizrwxgs029s9imz8g3p55ggncls709hf98brmv6wg5znjibs";
      type = "gem";
    };
-    version = "0.0.5";
+    version = "0.0.6";
  };
  rubocop = {
-    dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "rexml" "ruby-progressbar" "unicode-display_width"];
-    groups = ["development" "test"];
+    dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"];
+    groups = ["default" "development" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0pyjx2lbai93p6q3w57cxdhlcwhxfvm299xqicgarhdrv73mnv1d";
+      sha256 = "1yh71v5d7aw6jz7505d2sv0n0ldf3wh0ly3lphdanjl0n8b42y9h";
      type = "gem";
    };
-    version = "0.82.0";
+    version = "0.89.1";
+  };
+  rubocop-ast = {
+    dependencies = ["parser"];
+    groups = ["default" "development" "test"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "165ws2vwnw33nlqgzvzzjjp1zhkc712a92lbpbjx8j83g44dmdy4";
+      type = "gem";
+    };
+    version = "0.8.0";
  };
  rubocop-gitlab-security = {
    dependencies = ["rubocop"];
@ -4375,15 +4420,15 @@
    version = "0.1.1";
  };
  rubocop-performance = {
-    dependencies = ["rubocop"];
-    groups = ["development" "test"];
+    dependencies = ["rubocop" "rubocop-ast"];
+    groups = ["default" "development" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1fk9nd3b24avgsqp726hy2pl1iyfjrh6jni97wkky6kqy0lq6zq2";
+      sha256 = "13v66wi5l56bvp97nlmyxscq8ipkzfha1g7nlhcrbikvmrm3h5kf";
      type = "gem";
    };
-    version = "1.5.2";
+    version = "1.8.1";
  };
  rubocop-rails = {
    dependencies = ["activesupport" "rack" "rubocop"];
@ -4391,21 +4436,21 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "087fwq48n9k10c6npp7n5vbpx34nmaq3xkhw9n0v75m3l9rn8s34";
+      sha256 = "14g703lv0cbqw504cdjsv0yydrsnm61rwg0n0mql4zl5hw1n7lfh";
      type = "gem";
    };
-    version = "2.5.2";
+    version = "2.8.1";
  };
  rubocop-rspec = {
-    dependencies = ["rubocop"];
-    groups = ["development" "test"];
+    dependencies = ["rubocop" "rubocop-ast"];
+    groups = ["default" "development" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1dypzxzrm8lh1gip9pn93p1nwamzkqsljy6mcv2ngw9zqsial233";
+      sha256 = "0albi9zn8zrz1bb105xkcn5xdv6q7i7r34h9m4jsj5ygsvkkh8kv";
      type = "gem";
    };
-    version = "1.37.0";
+    version = "1.44.1";
  };
  ruby-enum = {
    dependencies = ["i18n"];
@ -4486,10 +4531,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0s3hsccsmrirc2hy3r51kl8g9cfmcn7jxaa0asadg1kn78h1sgr7";
+      sha256 = "0b6l5bxbamaplp904i7f088j806v0pqi0kvhb8xx81v4whl40y2k";
      type = "gem";
    };
-    version = "3.13.1";
+    version = "3.15.0";
  };
  rubyntlm = {
    groups = ["default"];
@ -4619,15 +4664,15 @@
    version = "0.8.2";
  };
  scss_lint = {
-    dependencies = ["rake" "sass"];
+    dependencies = ["sass"];
    groups = ["development" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "01bfkrjn1i0hfg1ifwn1rs7vqwdbdw158krwr5fm6iasd9zgl10g";
+      sha256 = "1s6dzk4n9pnmqciliggwpiny43vc3cx3n2d5gqa9aqng77ff7yv7";
      type = "gem";
    };
-    version = "0.56.0";
+    version = "0.59.0";
  };
  securecompare = {
    groups = ["default"];
@ -4687,10 +4732,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0w24rgmyjf7yz0xr2qhbr8z48h4m6gvbggr8nc1pldwn9rbi04b7";
+      sha256 = "0p0jj2la8bhb7kgqmqbksaq7idnpgjv6asgfd18d2l3z4kra14cj";
      type = "gem";
    };
-    version = "4.12.0";
+    version = "4.15.1";
  };
  shellany = {
    groups = ["default" "test"];
@ -4820,15 +4865,14 @@
    version = "0.6.1";
  };
  spring = {
-    dependencies = ["activesupport"];
    groups = ["development" "test"];
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "168yz9c1fv21wc5i8q7n43b9nk33ivg3ws1fn6x0afgryz3ssx75";
+      sha256 = "1x2wz1y2b0kp7mlk9k8zkl39rddk2l3x34b7dar3bh3axd1cs30d";
      type = "gem";
    };
-    version = "2.0.2";
+    version = "2.1.1";
  };
  spring-commands-rspec = {
    dependencies = ["spring"];
@ -5045,10 +5089,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "02p107kwx7jnkh6fpdgvaji0xdg6xkaarngkqjml6s4zny4m8slv";
+      sha256 = "08076cmdx0g51yrkd7dlxlr45nflink3jhdiq7006ljc2pc3212q";
      type = "gem";
    };
-    version = "0.11.0.0";
+    version = "0.13.0";
  };
  tilt = {
    groups = ["default" "development" "test"];
@ -5150,10 +5194,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r";
+      sha256 = "0skr6ih9cr3pwp8l84f0z7fy3q9kiq8hw0sg3zqw0hpbbyj05743";
      type = "gem";
    };
-    version = "1.2.7";
+    version = "1.2.8";
  };
  u2f = {
    groups = ["default"];
@ -5477,9 +5521,9 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0jvn50k76kl14fpymk4hdsf9sk00jl84yxzl783xhnw4dicp0m0k";
+      sha256 = "12n0hiawqayzchi0yga5n19hi63b2snd49fv3n23n2i4pp05jzrp";
      type = "gem";
    };
-    version = "2.4.0";
+    version = "2.4.1";
  };
 }
--- a/pkgs/applications/version-management/gitlab/update.py
+++ b/pkgs/applications/version-management/gitlab/update.py
@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.click python3Packages.click-log vgo2nix yarn2nix
+#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log vgo2nix yarn2nix

 import click
 import click_log
@ -40,9 +40,7 @@ class GitLabRepo:
        return versions

    def get_git_hash(self, rev: str):
-        out = subprocess.check_output(['nix-prefetch-git', self.url, rev])
-        j = json.loads(out)
-        return j['sha256']
+        return subprocess.check_output(['nix-universal-prefetch', 'fetchFromGitLab', '--owner', self.owner, '--repo', self.repo, '--rev', rev]).decode('utf-8').strip()

    @staticmethod
    def rev2version(tag: str) -> str:
--- a/pkgs/applications/version-management/gitlab/yarnPkgs.nix
+++ b/pkgs/applications/version-management/gitlab/yarnPkgs.nix
@ -778,27 +778,27 @@
      };
    }
    {
-      name = "_gitlab_eslint_plugin___eslint_plugin_4.0.0.tgz";
+      name = "_gitlab_eslint_plugin___eslint_plugin_5.0.0.tgz";
      path = fetchurl {
-        name = "_gitlab_eslint_plugin___eslint_plugin_4.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-4.0.0.tgz";
-        sha1 = "7beba53dea74f458d92040a8b2652e4fd60a6cc7";
+        name = "_gitlab_eslint_plugin___eslint_plugin_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/eslint-plugin/-/eslint-plugin-5.0.0.tgz";
+        sha1 = "502eb2bccb55d65d6310ce9ef2da76035b6fc319";
      };
    }
    {
-      name = "_gitlab_svgs___svgs_1.171.0.tgz";
+      name = "_gitlab_svgs___svgs_1.175.0.tgz";
      path = fetchurl {
-        name = "_gitlab_svgs___svgs_1.171.0.tgz";
-        url  = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.171.0.tgz";
-        sha1 = "abc3092bf804f0898301626130e0f3231834924a";
+        name = "_gitlab_svgs___svgs_1.175.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.175.0.tgz";
+        sha1 = "734f341784af1cd1d62d160a17bcdfb61ff7b04d";
      };
    }
    {
-      name = "_gitlab_ui___ui_21.33.0.tgz";
+      name = "_gitlab_ui___ui_23.9.0.tgz";
      path = fetchurl {
-        name = "_gitlab_ui___ui_21.33.0.tgz";
-        url  = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-21.33.0.tgz";
-        sha1 = "83dd7e4d65557f7b82ce1f9d7d6e7a1c54cb3dbc";
+        name = "_gitlab_ui___ui_23.9.0.tgz";
+        url  = "https://registry.yarnpkg.com/@gitlab/ui/-/ui-23.9.0.tgz";
+        sha1 = "e21966130b41e624dbe4505911a79afb731c2d6b";
      };
    }
    {
@ -1002,11 +1002,11 @@
      };
    }
    {
-      name = "_sourcegraph_code_host_integration___code_host_integration_0.0.50.tgz";
+      name = "_sourcegraph_code_host_integration___code_host_integration_0.0.52.tgz";
      path = fetchurl {
-        name = "_sourcegraph_code_host_integration___code_host_integration_0.0.50.tgz";
-        url  = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.50.tgz";
-        sha1 = "3f91be4c1b117efbf3d49c73033a6b1880db1c70";
+        name = "_sourcegraph_code_host_integration___code_host_integration_0.0.52.tgz";
+        url  = "https://registry.yarnpkg.com/@sourcegraph/code-host-integration/-/code-host-integration-0.0.52.tgz";
+        sha1 = "3668364647b9248a0c43d738f7b046c551311338";
      };
    }
    {
@ -1026,19 +1026,19 @@
      };
    }
    {
-      name = "_toast_ui_editor___editor_2.4.0.tgz";
+      name = "_toast_ui_editor___editor_2.5.0.tgz";
      path = fetchurl {
-        name = "_toast_ui_editor___editor_2.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.4.0.tgz";
-        sha1 = "0ed082da7e0160162dbc8f69d00ad3ab2adf81bc";
+        name = "_toast_ui_editor___editor_2.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@toast-ui/editor/-/editor-2.5.0.tgz";
+        sha1 = "02779b119eaa6dd7601249d75ca031e0b98400f1";
      };
    }
    {
-      name = "_toast_ui_vue_editor___vue_editor_2.4.0.tgz";
+      name = "_toast_ui_vue_editor___vue_editor_2.5.0.tgz";
      path = fetchurl {
-        name = "_toast_ui_vue_editor___vue_editor_2.4.0.tgz";
-        url  = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.4.0.tgz";
-        sha1 = "18b6629006f2dac5bfef4a26388499931d5fa869";
+        name = "_toast_ui_vue_editor___vue_editor_2.5.0.tgz";
+        url  = "https://registry.yarnpkg.com/@toast-ui/vue-editor/-/vue-editor-2.5.0.tgz";
+        sha1 = "8094136588b0f726241b5f89d0754a7169f2ffee";
      };
    }
    {
@ -1577,6 +1577,14 @@
        sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f";
      };
    }
+    {
+      name = "agent_base___agent_base_4.3.0.tgz";
+      path = fetchurl {
+        name = "agent_base___agent_base_4.3.0.tgz";
+        url  = "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz";
+        sha1 = "8165f01c436009bccad0b1d122f05ed770efc6ee";
+      };
+    }
    {
      name = "aggregate_error___aggregate_error_3.0.1.tgz";
      path = fetchurl {
@ -3945,6 +3953,14 @@
        sha1 = "5d128515df134ff327e90a4c93f4e077a536341f";
      };
    }
+    {
+      name = "debug___debug_3.1.0.tgz";
+      path = fetchurl {
+        name = "debug___debug_3.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz";
+        sha1 = "5bb5a0672628b64149566ba16819e61518c67261";
+      };
+    }
    {
      name = "debug___debug_3.2.6.tgz";
      path = fetchurl {
@ -3961,14 +3977,6 @@
        sha1 = "3b72260255109c6b589cee050f1d516139664791";
      };
    }
-    {
-      name = "debug___debug_3.1.0.tgz";
-      path = fetchurl {
-        name = "debug___debug_3.1.0.tgz";
-        url  = "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz";
-        sha1 = "5bb5a0672628b64149566ba16819e61518c67261";
-      };
-    }
    {
      name = "decamelize_keys___decamelize_keys_1.1.0.tgz";
      path = fetchurl {
@ -4386,11 +4394,11 @@
      };
    }
    {
-      name = "dompurify___dompurify_2.1.1.tgz";
+      name = "dompurify___dompurify_2.2.2.tgz";
      path = fetchurl {
-        name = "dompurify___dompurify_2.1.1.tgz";
-        url  = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.1.1.tgz";
-        sha1 = "b5aa988676b093a9c836d8b855680a8598af25fe";
+        name = "dompurify___dompurify_2.2.2.tgz";
+        url  = "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.2.tgz";
+        sha1 = "cb8c2b1a2f3c8a0b565127504ae4eedec176a972";
      };
    }
    {
@ -4681,6 +4689,14 @@
        sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a";
      };
    }
+    {
+      name = "es6_promise___es6_promise_4.2.8.tgz";
+      path = fetchurl {
+        name = "es6_promise___es6_promise_4.2.8.tgz";
+        url  = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz";
+        sha1 = "4eb21594c972bc40553d276e510539143db53e0a";
+      };
+    }
    {
      name = "es6_promise___es6_promise_3.0.2.tgz";
      path = fetchurl {
@ -4689,6 +4705,14 @@
        sha1 = "010d5858423a5f118979665f46486a95c6ee2bb6";
      };
    }
+    {
+      name = "es6_promisify___es6_promisify_5.0.0.tgz";
+      path = fetchurl {
+        name = "es6_promisify___es6_promisify_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz";
+        sha1 = "5109d62f3e56ea967c4b63505aef08291c8a5203";
+      };
+    }
    {
      name = "escape_goat___escape_goat_2.1.1.tgz";
      path = fetchurl {
@ -5866,19 +5890,19 @@
      };
    }
    {
-      name = "graphql_tag___graphql_tag_2.10.3.tgz";
+      name = "graphql_tag___graphql_tag_2.11.0.tgz";
      path = fetchurl {
-        name = "graphql_tag___graphql_tag_2.10.3.tgz";
-        url  = "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.3.tgz";
-        sha1 = "ea1baba5eb8fc6339e4c4cf049dabe522b0edf03";
+        name = "graphql_tag___graphql_tag_2.11.0.tgz";
+        url  = "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.11.0.tgz";
+        sha1 = "1deb53a01c46a7eb401d6cb59dec86fa1cccbffd";
      };
    }
    {
-      name = "graphql___graphql_14.7.0.tgz";
+      name = "graphql___graphql_15.4.0.tgz";
      path = fetchurl {
-        name = "graphql___graphql_14.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/graphql/-/graphql-14.7.0.tgz";
-        sha1 = "7fa79a80a69be4a31c27dda824dc04dac2035a72";
+        name = "graphql___graphql_15.4.0.tgz";
+        url  = "https://registry.yarnpkg.com/graphql/-/graphql-15.4.0.tgz";
+        sha1 = "e459dea1150da5a106486ba7276518b5295a4347";
      };
    }
    {
@ -6201,6 +6225,14 @@
        sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736";
      };
    }
+    {
+      name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz";
+      path = fetchurl {
+        name = "http_proxy_agent___http_proxy_agent_2.1.0.tgz";
+        url  = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz";
+        sha1 = "e4821beef5b2142a2026bd73926fe537631c5405";
+      };
+    }
    {
      name = "http_proxy_middleware___http_proxy_middleware_0.19.1.tgz";
      path = fetchurl {
@ -6233,6 +6265,14 @@
        sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73";
      };
    }
+    {
+      name = "https_proxy_agent___https_proxy_agent_2.2.4.tgz";
+      path = fetchurl {
+        name = "https_proxy_agent___https_proxy_agent_2.2.4.tgz";
+        url  = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz";
+        sha1 = "4ee7a737abd92678a293d9b34a1af4d0d08c787b";
+      };
+    }
    {
      name = "human_signals___human_signals_1.1.1.tgz";
      path = fetchurl {
@ -7201,14 +7241,6 @@
        sha1 = "a5231a08ef6dd22b268d0895084cf8d58b5bec53";
      };
    }
-    {
-      name = "iterall___iterall_1.2.2.tgz";
-      path = fetchurl {
-        name = "iterall___iterall_1.2.2.tgz";
-        url  = "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz";
-        sha1 = "92d70deb8028e0c39ff3164fdbf4d8b088130cd7";
-      };
-    }
    {
      name = "jasmine_core___jasmine_core_2.9.0.tgz";
      path = fetchurl {
@ -7713,6 +7745,14 @@
        sha1 = "779fb0018604fa854eacbf6252180d83543e3dbe";
      };
    }
+    {
+      name = "jsonc_parser___jsonc_parser_2.3.1.tgz";
+      path = fetchurl {
+        name = "jsonc_parser___jsonc_parser_2.3.1.tgz";
+        url  = "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-2.3.1.tgz";
+        sha1 = "59549150b133f2efacca48fe9ce1ec0659af2342";
+      };
+    }
    {
      name = "jsonc_parser___jsonc_parser_2.2.1.tgz";
      path = fetchurl {
@ -7969,6 +8009,14 @@
        sha1 = "c4caf38a6cd7ac2212ef3c7d2bde30a91561f9db";
      };
    }
+    {
+      name = "linkify_it___linkify_it_3.0.2.tgz";
+      path = fetchurl {
+        name = "linkify_it___linkify_it_3.0.2.tgz";
+        url  = "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.2.tgz";
+        sha1 = "f55eeb8bc1d3ae754049e124ab3bb56d97797fb8";
+      };
+    }
    {
      name = "load_json_file___load_json_file_1.1.0.tgz";
      path = fetchurl {
@ -8474,11 +8522,11 @@
      };
    }
    {
-      name = "markdown_it___markdown_it_10.0.0.tgz";
+      name = "markdown_it___markdown_it_11.0.0.tgz";
      path = fetchurl {
-        name = "markdown_it___markdown_it_10.0.0.tgz";
-        url  = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz";
-        sha1 = "abfc64f141b1722d663402044e43927f1f50a8dc";
+        name = "markdown_it___markdown_it_11.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-11.0.0.tgz";
+        sha1 = "dbfc30363e43d756ebc52c38586b91b90046b876";
      };
    }
    {
@ -8498,27 +8546,27 @@
      };
    }
    {
-      name = "markdownlint_cli___markdownlint_cli_0.23.2.tgz";
+      name = "markdownlint_cli___markdownlint_cli_0.24.0.tgz";
      path = fetchurl {
-        name = "markdownlint_cli___markdownlint_cli_0.23.2.tgz";
-        url  = "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.23.2.tgz";
-        sha1 = "43f0a96e2699542b74fb5e6188c025e4934357fc";
+        name = "markdownlint_cli___markdownlint_cli_0.24.0.tgz";
+        url  = "https://registry.yarnpkg.com/markdownlint-cli/-/markdownlint-cli-0.24.0.tgz";
+        sha1 = "d1c1d43cd53b87aaec93035b3234eef7097139a8";
      };
    }
    {
-      name = "markdownlint_rule_helpers___markdownlint_rule_helpers_0.11.0.tgz";
+      name = "markdownlint_rule_helpers___markdownlint_rule_helpers_0.12.0.tgz";
      path = fetchurl {
-        name = "markdownlint_rule_helpers___markdownlint_rule_helpers_0.11.0.tgz";
-        url  = "https://registry.yarnpkg.com/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.11.0.tgz";
-        sha1 = "faaaae4337771c7d88ca38ef6265afb4fbe0fb3f";
+        name = "markdownlint_rule_helpers___markdownlint_rule_helpers_0.12.0.tgz";
+        url  = "https://registry.yarnpkg.com/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.12.0.tgz";
+        sha1 = "c41d9b990c50911572e8eb2fba3e6975a5514b7e";
      };
    }
    {
-      name = "markdownlint___markdownlint_0.20.4.tgz";
+      name = "markdownlint___markdownlint_0.21.1.tgz";
      path = fetchurl {
-        name = "markdownlint___markdownlint_0.20.4.tgz";
-        url  = "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.20.4.tgz";
-        sha1 = "3b34681494cdad174e14a27182b5cdefaa537823";
+        name = "markdownlint___markdownlint_0.21.1.tgz";
+        url  = "https://registry.yarnpkg.com/markdownlint/-/markdownlint-0.21.1.tgz";
+        sha1 = "9442afcf12bf65ce9d613212028cf85741677421";
      };
    }
    {
@ -8922,11 +8970,11 @@
      };
    }
    {
-      name = "monaco_yaml___monaco_yaml_2.4.1.tgz";
+      name = "monaco_yaml___monaco_yaml_2.5.1.tgz";
      path = fetchurl {
-        name = "monaco_yaml___monaco_yaml_2.4.1.tgz";
-        url  = "https://registry.yarnpkg.com/monaco-yaml/-/monaco-yaml-2.4.1.tgz";
-        sha1 = "f0d3384b1f10cc7af2b60e3a30b0adc6683b728a";
+        name = "monaco_yaml___monaco_yaml_2.5.1.tgz";
+        url  = "https://registry.yarnpkg.com/monaco-yaml/-/monaco-yaml-2.5.1.tgz";
+        sha1 = "af9303a4aa6e3b94db62b8a8659362f31944590d";
      };
    }
    {
@ -10210,11 +10258,11 @@
      };
    }
    {
-      name = "prettier___prettier_1.19.1.tgz";
+      name = "prettier___prettier_2.0.5.tgz";
      path = fetchurl {
-        name = "prettier___prettier_1.19.1.tgz";
-        url  = "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz";
-        sha1 = "f7d7f5ff8a9cd872a7be4ca142095956a60797cb";
+        name = "prettier___prettier_2.0.5.tgz";
+        url  = "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz";
+        sha1 = "d6d56282455243f2f92cc1716692c08aa31522d4";
      };
    }
    {
@ -10921,6 +10969,14 @@
        sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb";
      };
    }
+    {
+      name = "request_light___request_light_0.2.5.tgz";
+      path = fetchurl {
+        name = "request_light___request_light_0.2.5.tgz";
+        url  = "https://registry.yarnpkg.com/request-light/-/request-light-0.2.5.tgz";
+        sha1 = "38a3da7b2e56f7af8cbba57e8a94930ee2380746";
+      };
+    }
    {
      name = "request_promise_core___request_promise_core_1.1.4.tgz";
      path = fetchurl {
@ -13274,11 +13330,11 @@
      };
    }
    {
-      name = "vscode_json_languageservice___vscode_json_languageservice_3.7.0.tgz";
+      name = "vscode_json_languageservice___vscode_json_languageservice_3.9.1.tgz";
      path = fetchurl {
-        name = "vscode_json_languageservice___vscode_json_languageservice_3.7.0.tgz";
-        url  = "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.7.0.tgz";
-        sha1 = "0174417f139cf41dd60c84538fd052385bfb46f6";
+        name = "vscode_json_languageservice___vscode_json_languageservice_3.9.1.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.9.1.tgz";
+        sha1 = "f72b581f8cd2bd9b47445ccf8b0ddcde6aba7483";
      };
    }
    {
@ -13313,6 +13369,14 @@
        sha1 = "d3b5952246d30e5241592b6dde8280e03942e743";
      };
    }
+    {
+      name = "vscode_languageserver_types___vscode_languageserver_types_3.16.0_next.2.tgz";
+      path = fetchurl {
+        name = "vscode_languageserver_types___vscode_languageserver_types_3.16.0_next.2.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz";
+        sha1 = "940bd15c992295a65eae8ab6b8568a1e8daa3083";
+      };
+    }
    {
      name = "vscode_languageserver_types___vscode_languageserver_types_3.15.1.tgz";
      path = fetchurl {
@ -13337,6 +13401,14 @@
        sha1 = "ca8bf8bb82a0987b32801f9fddfdd2fb9fd3c167";
      };
    }
+    {
+      name = "vscode_nls___vscode_nls_5.0.0.tgz";
+      path = fetchurl {
+        name = "vscode_nls___vscode_nls_5.0.0.tgz";
+        url  = "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.0.0.tgz";
+        sha1 = "99f0da0bd9ea7cda44e565a74c54b1f2bc257840";
+      };
+    }
    {
      name = "vscode_uri___vscode_uri_1.0.8.tgz";
      path = fetchurl {
@ -13402,11 +13474,11 @@
      };
    }
    {
-      name = "vue_router___vue_router_3.4.7.tgz";
+      name = "vue_router___vue_router_3.4.5.tgz";
      path = fetchurl {
-        name = "vue_router___vue_router_3.4.7.tgz";
-        url  = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.7.tgz";
-        sha1 = "bf189bafd16f4e4ef783c4a6250a3090f2c1fa1b";
+        name = "vue_router___vue_router_3.4.5.tgz";
+        url  = "https://registry.yarnpkg.com/vue-router/-/vue-router-3.4.5.tgz";
+        sha1 = "d396ec037b35931bdd1e9b7edd86f9788dc15175";
      };
    }
    {
@ -13937,6 +14009,22 @@
        sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72";
      };
    }
+    {
+      name = "yaml_ast_parser_custom_tags___yaml_ast_parser_custom_tags_0.0.43.tgz";
+      path = fetchurl {
+        name = "yaml_ast_parser_custom_tags___yaml_ast_parser_custom_tags_0.0.43.tgz";
+        url  = "https://registry.yarnpkg.com/yaml-ast-parser-custom-tags/-/yaml-ast-parser-custom-tags-0.0.43.tgz";
+        sha1 = "46968145ce4e24cb03c3312057f0f141b93a7d02";
+      };
+    }
+    {
+      name = "yaml_language_server___yaml_language_server_0.11.1.tgz";
+      path = fetchurl {
+        name = "yaml_language_server___yaml_language_server_0.11.1.tgz";
+        url  = "https://registry.yarnpkg.com/yaml-language-server/-/yaml-language-server-0.11.1.tgz";
+        sha1 = "4ddc72eb9a6dd7dc41f31af2a8f5c72cce456cc9";
+      };
+    }
    {
      name = "yargs_parser___yargs_parser_20.2.1.tgz";
      path = fetchurl {
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@ -201,6 +201,16 @@ in

  gitlab-markup = attrs: { meta.priority = 1; };

+  gitlab-pg_query = attrs: lib.optionalAttrs (attrs.version == "1.3.0") {
+    dontBuild = false;
+    postPatch = ''
+      sed -i 's;"https://gitlab.com.*";"${fetchurl {
+        url = "https://gitlab.com/gitlab-org/libpg_query/-/archive/gitlab-10-1.0.3/libpg_query-gitlab-10-1.0.3.tar.gz";
+        sha256 = "1519x4v6wrk189mjg4hlfah0f7hjy3syg8kk8b6g644gdspzs26j";
+      }}";' ext/pg_query/extconf.rb
+    '';
+  };
+
  glib2 = attrs: {
    nativeBuildInputs = [ pkgconfig ];
    buildInputs = [ gtk2 pcre ];
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -4140,18 +4140,27 @@ in

  gitkraken = callPackage ../applications/version-management/gitkraken { };

-  gitlab = callPackage ../applications/version-management/gitlab { };
-  gitlab-ee = callPackage ../applications/version-management/gitlab { gitlabEnterprise = true; };
+  gitlab = callPackage ../applications/version-management/gitlab {
+    ruby = ruby_2_7;
+  };
+  gitlab-ee = callPackage ../applications/version-management/gitlab {
+    ruby = ruby_2_7;
+    gitlabEnterprise = true;
+  };

  gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { };

-  gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { };
+  gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell {
+    ruby = ruby_2_7;
+  };

  gitlab-triage = callPackage ../applications/version-management/gitlab-triage { };

  gitlab-workhorse = callPackage ../applications/version-management/gitlab/gitlab-workhorse { };

-  gitaly = callPackage ../applications/version-management/gitlab/gitaly { };
+  gitaly = callPackage ../applications/version-management/gitlab/gitaly {
+    ruby = ruby_2_7;
+  };

  gitstats = callPackage ../applications/version-management/gitstats { };