diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-21 13:15:00 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-21 13:15:00 +0300 |
| commit | a25ac8a89b839653e469693d77b931b158731cca (patch) | |
| tree | b1f5354d021a7c70b39164194028eeab10e87a47 /app | |
| parent | dd12ffc006b6ad07d1c17b223ae9eea07912d2e1 (diff) | |
| parent | 02d69091bc1d2ea4d14731b103efd5a5e2c9f040 (diff) | |
Merge branch 'add_spec_for_committer_hash' into 'master'
Add spec covering 'committer_hash'
Adds a missing spec from changes added in !5822
See merge request !6433
Diffstat (limited to 'app')
| -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, |