diff options
| author | Dan Dunckel <dldunckel@gmail.com> | 2016-09-20 09:07:52 -0700 |
|---|---|---|
| committer | Dan Dunckel <dldunckel@gmail.com> | 2016-09-20 10:15:43 -0700 |
| commit | 02d69091bc1d2ea4d14731b103efd5a5e2c9f040 (patch) | |
| tree | 4111492d5b2dc24dc4b7cc25e0e6946cdaac6685 /app/models/repository.rb | |
| parent | 422c90251d9dbe42d5a8c852124398d1beae9176 (diff) | |
| download | gitlab-ce-02d69091bc1d2ea4d14731b103efd5a5e2c9f040.tar.gz | |
Add spec covering 'committer_hash'
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 772c62a4124..51557228ab9 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -840,7 +840,7 @@ class Repository def get_committer_and_author(user, email: nil, name: nil) committer = user_to_committer(user) - author = name && email ? Gitlab::Git::committer_hash(email: email, name: name) : committer + author = Gitlab::Git::committer_hash(email: email, name: name) || committer { author: author, |