Moved committer and spec. Added some extra code to run hooks or not depending on the options

lib/gitlab/wiki/committer_with_hooks.rb → lib/gitlab/git/committer_with_hooks.rb

 module Gitlab
-  module Wiki
+  module Git
     class CommitterWithHooks < Gollum::Committer
       attr_reader :gl_wiki
 
@@ -9,6 +9,9 @@ module Gitlab
       end
 
       def commit
+        # TODO: Remove after 10.8
+        return super unless allowed_to_run_hooks?
+
         result = Gitlab::Git::OperationService.new(git_user, gl_wiki.repository).with_branch(
           @wiki.ref,
           start_branch_name: @wiki.ref
@@ -24,6 +27,11 @@ module Gitlab
 
       private
 
+      # TODO: Remove after 10.8
+      def allowed_to_run_hooks?
+        @options[:user_id] != 0 && @options[:username].present?
+      end
+
       def git_user
         @git_user ||= Gitlab::Git::User.new(@options[:username],
                                             @options[:name],

lib/gitlab/git/wiki.rb

@@ -290,7 +290,7 @@ module Gitlab
       end
 
       def committer_with_hooks(commit_details)
-        Gitlab::Wiki::CommitterWithHooks.new(self, commit_details.to_h)
+        Gitlab::Git::CommitterWithHooks.new(self, commit_details.to_h)
       end
 
       def with_committer_with_hooks(commit_details, &block)

spec/lib/gitlab/wiki/committer_with_hooks_spec.rb → spec/lib/gitlab/git/committer_with_hooks_spec.rb

 require 'spec_helper'
 
-describe Gitlab::Wiki::CommitterWithHooks, seed_helper: true do
+describe Gitlab::Git::CommitterWithHooks, seed_helper: true do
   shared_examples 'calling wiki hooks' do
     let(:project) { create(:project) }
     let(:user) { project.owner }