]> git.pld-linux.org Git - packages/gitlab-ce.git/blame - 3774.patch
schama.rb needs to be writable
[packages/gitlab-ce.git] / 3774.patch
CommitLineData
79bdc113
ER
1https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3774
2
3From e5d9d3657d67e49c518bf414c47f335c080cd20d Mon Sep 17 00:00:00 2001
4From: Elan Ruusamäe <glen@delfi.ee>
5Date: Sun, 17 Apr 2016 18:11:28 +0000
6Subject: [PATCH] update gitlab shell secret file also when it is empty
7
8---
9 config/initializers/gitlab_shell_secret_token.rb | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/config/initializers/gitlab_shell_secret_token.rb b/config/initializers/gitlab_shell_secret_token.rb
13index 751fcce..f086b2a 100644
14--- a/config/initializers/gitlab_shell_secret_token.rb
15+++ b/config/initializers/gitlab_shell_secret_token.rb
16@@ -7,7 +7,7 @@ require 'securerandom'
17
18 secret_file = Gitlab.config.gitlab_shell.secret_file
19
20-unless File.exist? secret_file
21+unless File.size? secret_file
22 # Generate a new token of 16 random hexadecimal characters and store it in secret_file.
23 token = SecureRandom.hex(16)
24 File.write(secret_file, token)
25--
26libgit2 0.24.0
27
This page took 0.098802 seconds and 4 git commands to generate.