From 6be388625fb86af640523688a25a55c8cf5f62e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=C3=A4ssler?= <me@pbb.lc>
Date: Tue, 7 Jul 2020 22:15:07 +0200
Subject: [PATCH] gitlab: 12.10.13 -> 12.10.14

Security release: https://about.gitlab.com/releases/2020/07/06/critical-security-release-gitlab-13-1-3-released/
---
 pkgs/applications/version-management/gitlab/data.json     | 8 ++++----
 .../version-management/gitlab/gitaly/default.nix          | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index f042ae24b080..d6b4b6fb3717 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,11 +1,11 @@
 {
-  "version": "12.10.13",
-  "repo_hash": "0smhx2v5l9ya4j3xq66w9m4jbd72k74f6j67k6nrw7862pl251gc",
+  "version": "12.10.14",
+  "repo_hash": "1h3h5irmanaxizw66dw87ahrnzpfs3g4s9gxlsypbkdnzbi1rfsm",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v12.10.13-ee",
+  "rev": "v12.10.14-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "12.10.13",
+    "GITALY_SERVER_VERSION": "12.10.14",
     "GITLAB_PAGES_VERSION": "1.17.0",
     "GITLAB_SHELL_VERSION": "12.2.0",
     "GITLAB_WORKHORSE_VERSION": "8.30.3"
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 719bd6ee8777..d2f4ec0f5301 100644
--- 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 = "12.10.13";
+  version = "12.10.14";
   pname = "gitaly";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "0x6zlj468l5fmq1r7hb2sr2z9dy8pr0apnpmbf28ivap942a10dx";
+    sha256 = "0v2ikj4vvlgj2cpp4m5di9kw63nsc3p9hgjfacvzr7nj3ar2pwqa";
   };
 
   # Fix a check which assumes that hook files are writeable by their