commit 79bdc113047a34d784062cf1a3d50c1028fba224
Author: Elan Ruusamäe <[email protected]>
Date: Sat Apr 23 11:31:51 2016 +0300
allow empty shell secret
3774.patch | 27 +++++++++++++++++++++++++++
gitlab-ce.spec | 4 +++-
2 files changed, 30 insertions(+), 1 deletion(-)
---
diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index 4ed1331..db1ec1d 100644
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -17,11 +17,12 @@
Summary: A Web interface to create projects and repositories, manage
access and do code reviews
Name: gitlab-ce
Version: 8.6.6
-Release: 0.5
+Release: 0.6
License: MIT
Group: Applications/WWW
# md5 deliberately omitted until this package is useful
Source0:
https://github.com/gitlabhq/gitlabhq/archive/v%{version}/%{name}-%{version}.tar.gz
+Patch0:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3774.patch
URL: https://www.gitlab.com/gitlab-ce/
Source1: gitlab.target
Source2: gitlab-sidekiq.service
@@ -66,6 +67,7 @@ use on your server(s).
%prep
%setup -qn gitlabhq-%{version}
+%patch0 -p1
# Patching config files:
sed -e "s|# user: git|user: gitlab|" \
diff --git a/3774.patch b/3774.patch
new file mode 100644
index 0000000..be08efd
--- /dev/null
+++ b/3774.patch
@@ -0,0 +1,27 @@
+https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3774
+
+From e5d9d3657d67e49c518bf414c47f335c080cd20d Mon Sep 17 00:00:00 2001
+From: Elan Ruusamäe <[email protected]>
+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/fb518a6fb49fa4c95ffbde8790938b088269a779
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
