Commit da769135 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Rubocop whitespace

parent c47b947a
...@@ -2,7 +2,7 @@ module Gitlab ...@@ -2,7 +2,7 @@ module Gitlab
module Git module Git
class Committer class Committer
attr_reader :name, :email, :gl_id attr_reader :name, :email, :gl_id
def self.from_user(user) def self.from_user(user)
new(user.name, user.email, Gitlab::GlId.gl_id(user)) new(user.name, user.email, Gitlab::GlId.gl_id(user))
end end
......
...@@ -2,31 +2,31 @@ module Gitlab ...@@ -2,31 +2,31 @@ module Gitlab
module Git module Git
class HooksService class HooksService
PreReceiveError = Class.new(StandardError) PreReceiveError = Class.new(StandardError)
attr_accessor :oldrev, :newrev, :ref attr_accessor :oldrev, :newrev, :ref
def execute(committer, repository, oldrev, newrev, ref) def execute(committer, repository, oldrev, newrev, ref)
@repository = repository @repository = repository
@gl_id = committer.gl_id @gl_id = committer.gl_id
@oldrev = oldrev @oldrev = oldrev
@newrev = newrev @newrev = newrev
@ref = ref @ref = ref
%w(pre-receive update).each do |hook_name| %w(pre-receive update).each do |hook_name|
status, message = run_hook(hook_name) status, message = run_hook(hook_name)
unless status unless status
raise PreReceiveError, message raise PreReceiveError, message
end end
end end
yield(self).tap do yield(self).tap do
run_hook('post-receive') run_hook('post-receive')
end end
end end
private private
def run_hook(name) def run_hook(name)
hook = Gitlab::Git::Hook.new(name, @repository) hook = Gitlab::Git::Hook.new(name, @repository)
hook.trigger(@gl_id, oldrev, newrev, ref) hook.trigger(@gl_id, oldrev, newrev, ref)
...@@ -34,4 +34,3 @@ module Gitlab ...@@ -34,4 +34,3 @@ module Gitlab
end end
end end
end end
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