Skip to content

G
gitlab-ce
Commit 1891cab4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Fix conflict issue 

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 3b02ad84
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
app/models/repository.rb
View file @ 1891cab4
...@@ -403,8 +403,6 @@ class Repository ...@@ -403,8 +403,6 @@ class Repository
Gitlab::Git::Blob.remove(raw_repository, options) Gitlab::Git::Blob.remove(raw_repository, options)
end end
private
def user_to_comitter(user) def user_to_comitter(user)
{ {
email: user.email, email: user.email,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7