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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6cdb4553
Commit
6cdb4553
authored
Sep 15, 2018
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Return a default commit email if migration has not completed
Closes
https://gitlab.com/gitlab-org/gitlab-ce/issues/51530
parent
a30e266e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/models/user.rb
app/models/user.rb
+1
-1
No files found.
app/models/user.rb
View file @
6cdb4553
...
@@ -635,7 +635,7 @@ class User < ActiveRecord::Base
...
@@ -635,7 +635,7 @@ class User < ActiveRecord::Base
# possibility of the commit_email column not existing.
# possibility of the commit_email column not existing.
def
commit_email
def
commit_email
return
unless
has_attribute?
(
:commit_email
)
return
self
.
email
unless
has_attribute?
(
:commit_email
)
# The commit email is the same as the primary email if undefined
# The commit email is the same as the primary email if undefined
super
.
presence
||
self
.
email
super
.
presence
||
self
.
email
...
...
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