diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 11:12:35 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-08-12 13:48:56 +0300 |
| commit | 52d10d73ea60649c79ef7804eb0a43953ff473b2 (patch) | |
| tree | c1fbe29906b08dc44f33cb7db6da11d61e87d69d | |
| parent | 2258572b80bf9b07ffb4795639b489e7f7f346e7 (diff) | |
| download | gitlab-ce-52d10d73ea60649c79ef7804eb0a43953ff473b2.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 29bccbbaf58..dae19b9ddca 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, |