Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
c954f2d9
Commit
c954f2d9
authored
Nov 29, 2012
by
Alexey Loktionov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
issue #2118: fix undefined method for nil:NilClass exception
parent
ff9a2e2a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/workers/post_receive.rb
app/workers/post_receive.rb
+2
-2
No files found.
app/workers/post_receive.rb
View file @
c954f2d9
...
@@ -7,8 +7,8 @@ class PostReceive
...
@@ -7,8 +7,8 @@ class PostReceive
# Ignore push from non-gitlab users
# Ignore push from non-gitlab users
user
=
if
identifier
.
eql?
Gitlab
.
config
.
gitolite_admin_key
user
=
if
identifier
.
eql?
Gitlab
.
config
.
gitolite_admin_key
email
=
project
.
commit
(
newrev
).
author
.
email
email
=
project
.
commit
(
newrev
).
author
.
email
rescue
nil
User
.
find_by_email
(
email
)
User
.
find_by_email
(
email
)
if
email
elsif
/^[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,4}$/
.
match
(
identifier
)
elsif
/^[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,4}$/
.
match
(
identifier
)
User
.
find_by_email
(
identifier
)
User
.
find_by_email
(
identifier
)
else
else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment