Decouple GitOperationService from User

2 files changed, 10 insertions, 7 deletions

diff --git a/app/services/git_hooks_service.rb b/app/services/git_hooks_service.rb
index eab65d09299..e85007c26e0 100644
--- a/app/services/git_hooks_service.rb
+++ b/app/services/git_hooks_service.rb
@@ -3,9 +3,9 @@ class GitHooksService
 
   attr_accessor :oldrev, :newrev, :ref
 
-  def execute(user, project, oldrev, newrev, ref)
+  def execute(committer, project, oldrev, newrev, ref)
     @project    = project
-    @user       = Gitlab::GlId.gl_id(user)
+    @gl_id       = committer.gl_id
     @oldrev     = oldrev
     @newrev     = newrev
     @ref        = ref
@@ -27,6 +27,6 @@ class GitHooksService
 
   def run_hook(name)
     hook = Gitlab::Git::Hook.new(name, @project)
-    hook.trigger(@user, oldrev, newrev, ref)
+    hook.trigger(@gl_id, oldrev, newrev, ref)
   end
 end
diff --git a/app/services/git_operation_service.rb b/app/services/git_operation_service.rb
index 545ca0742e4..f7fce3d8a5d 100644
--- a/app/services/git_operation_service.rb
+++ b/app/services/git_operation_service.rb
@@ -1,8 +1,11 @@
 class GitOperationService
-  attr_reader :user, :repository
+  attr_reader :committer, :repository
 
-  def initialize(new_user, new_repository)
-    @user = new_user
+  def initialize(committer, new_repository)
+    if committer && !committer.is_a?(Gitlab::Git::Committer)
+      raise "expected Gitlab::Git::Committer, got #{committer.inspect}"
+    end
+    @committer = committer
     @repository = new_repository
   end
 
@@ -119,7 +122,7 @@ class GitOperationService
 
   def with_hooks(ref, newrev, oldrev)
     GitHooksService.new.execute(
-      user,
+      committer,
       repository.project,
       oldrev,
       newrev,