commit 340a918f307428ac49c7000542a8bdd2cac3d257
Author: Elan Ruusamäe <g...@delfi.ee>
Date:   Mon May 22 20:39:42 2017 +0300

    3774.patch merged long time ago

 3774.patch     | 27 ---------------------------
 gitlab-ce.spec |  2 --
 2 files changed, 29 deletions(-)
---
diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index b70f085..6528607 100644
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -40,7 +40,6 @@ Source11:     gitlab-ctl.sh
 Source12:      clean-vendor.sh
 Source13:      nginx.conf
 Source14:      gitconfig
-Patch0:                3774.patch
 Patch1:                pld.patch
 URL:           https://www.gitlab.com/gitlab-ce/
 BuildRequires: cmake
@@ -107,7 +106,6 @@ Documentation for GitLab.
 mv gitlab-ce-v%{version}-*/{.??*,*} .
 mv config/gitlab.yml.example config/gitlab.yml
 mv config/unicorn.rb.example config/unicorn.rb
-#%patch0 -p1
 %patch1 -p1
 
 # use mysql for now
diff --git a/3774.patch b/3774.patch
deleted file mode 100644
index be08efd..0000000
--- a/3774.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3774
-
-From e5d9d3657d67e49c518bf414c47f335c080cd20d Mon Sep 17 00:00:00 2001
-From: Elan Ruusamäe <g...@delfi.ee>
-Date: Sun, 17 Apr 2016 18:11:28 +0000
-Subject: [PATCH] update gitlab shell secret file also when it is empty
-
----
- config/initializers/gitlab_shell_secret_token.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config/initializers/gitlab_shell_secret_token.rb 
b/config/initializers/gitlab_shell_secret_token.rb
-index 751fcce..f086b2a 100644
---- a/config/initializers/gitlab_shell_secret_token.rb
-+++ b/config/initializers/gitlab_shell_secret_token.rb
-@@ -7,7 +7,7 @@ require 'securerandom'
- 
- secret_file = Gitlab.config.gitlab_shell.secret_file
- 
--unless File.exist? secret_file
-+unless File.size? secret_file
-   # Generate a new token of 16 random hexadecimal characters and store it in 
secret_file.
-   token = SecureRandom.hex(16)
-   File.write(secret_file, token)
---
-libgit2 0.24.0
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ce.git/commitdiff/869e18f4b14b994bd709629c24e0daaa3277ac73

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to