commit dbf1121fde28ecee7a04c67faa5dc56dfb5f81bf
Author: Elan Ruusamäe <[email protected]>
Date: Fri Dec 23 16:48:21 2016 +0200
post_receive-any-email.patch outdated
applied upstream
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7225
https://gitlab.com/gitlab-org/gitlab-ce/issues/24900
gitlab-ce.spec | 2 --
post_receive-any-email.patch | 12 ------------
2 files changed, 14 deletions(-)
---
diff --git a/gitlab-ce.spec b/gitlab-ce.spec
index f70adb0..7a1e14d 100644
--- a/gitlab-ce.spec
+++ b/gitlab-ce.spec
@@ -39,7 +39,6 @@ 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
@@ -106,7 +105,6 @@ 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
deleted file mode 100644
index e2a15d6..0000000
--- a/post_receive-any-email.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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/5b41e0833e66c7ad27867ecda8b3e06b72a5088e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
