diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 11:12:35 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 11:12:35 +0200 |
| commit | 1891cab44ce63e63c6606675021f8eaf81444aee (patch) | |
| tree | 756f165b764ed5ddd1abeda9e1257da83e73b481 | |
| parent | 3b02ad846723888a8468f5be88bcbb5955028b6d (diff) | |
| download | gitlab-ce-1891cab44ce63e63c6606675021f8eaf81444aee.tar.gz | |
Fix conflict issue
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 4394f948e12..638e278b49e 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -403,8 +403,6 @@ class Repository Gitlab::Git::Blob.remove(raw_repository, options) end - private - def user_to_comitter(user) { email: user.email, |