Commit 9bf7bd27 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'kalibyrn/gitlab-ee-downcase-emails-for-hook'

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parents aa0d6581 c4afa10c
...@@ -187,7 +187,7 @@ module Gitlab ...@@ -187,7 +187,7 @@ module Gitlab
oldrev = project.default_branch if Gitlab::Git.blank_ref?(oldrev) oldrev = project.default_branch if Gitlab::Git.blank_ref?(oldrev)
commits = commits =
if oldrev if oldrev
project.repository.commits_between(oldrev, newrev) project.repository.commits_between(oldrev, newrev)
else else
...@@ -213,12 +213,12 @@ module Gitlab ...@@ -213,12 +213,12 @@ module Gitlab
# Check whether author is a GitLab member # Check whether author is a GitLab member
if git_hook.member_check if git_hook.member_check
unless User.existing_member?(commit.author_email) unless User.existing_member?(commit.author_email.downcase)
return build_status_object(false, "Author '#{commit.author_email}' is not a member of team") return build_status_object(false, "Author '#{commit.author_email}' is not a member of team")
end end
if commit.author_email != commit.committer_email if commit.author_email.downcase != commit.committer_email.downcase
unless User.existing_member?(commit.committer_email) unless User.existing_member?(commit.committer_email.downcase)
return build_status_object(false, "Committer '#{commit.committer_email}' is not a member of team") return build_status_object(false, "Committer '#{commit.committer_email}' is not a member of team")
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment