[packages/gitlab-ce] idenfity user by any email in post_receive hook

[glen]

commit 6fcca392c845355739c853495d2b1fad2dea75e7
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Nov 2 00:40:37 2016 +0200

    idenfity user by any email in post_receive hook

 gitlab-ce.spec               |  4 +++-
 post_receive-any-email.patch | 12 ++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index ea8cb03..2e54054 100644
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -19,7 +19,7 @@
 Summary:	A Web interface to create projects and repositories, manage access and do code reviews
 Name:		gitlab-ce
 Version:	8.13.2
-Release:	0.80
+Release:	0.81
 License:	MIT
 Group:		Applications/WWW
 # md5 deliberately omitted until this package is useful
@@ -39,6 +39,7 @@ Source12:	clean-vendor.sh
 Source13:	nginx.conf
 Patch0:		3774.patch
 Patch1:		pld.patch
+Patch2:		post_receive-any-email.patch
 URL:		https://www.gitlab.com/gitlab-ce/
 BuildRequires:	cmake
 BuildRequires:	gmp-devel
@@ -104,6 +105,7 @@ mv config/gitlab.yml.example config/gitlab.yml
 mv config/unicorn.rb.example config/unicorn.rb
 #%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # use mysql for now
 mv config/database.yml.mysql config/database.yml
diff --git a/post_receive-any-email.patch b/post_receive-any-email.patch
new file mode 100644
index 0000000..e2a15d6
--- /dev/null
+++ b/post_receive-any-email.patch
@@ -0,0 +1,12 @@
+https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7225
+
+--- gitlabhq-8.13.2/lib/gitlab/identifier.rb~	2016-10-31 16:41:44.000000000 +0200
++++ gitlabhq-8.13.2/lib/gitlab/identifier.rb	2016-11-02 00:05:55.000000000 +0200
+@@ -18,6 +21,6 @@
+ 
+       identify_with_cache(:email, email) do
+-        User.find_by(email: email)
++        User.find_by_any_email(email)
+       end
+     end
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gitlab-ce.git/commitdiff/6fcca392c845355739c853495d2b1fad2dea75e7