Remove Gitlab::Git::Repository#rugged and Gollum code

Cleanup code, and refactor tests that still use Rugged. After this, there should
be no Rugged code that access the instance's repositories on non-test
environments. There is still some rugged code for other tasks like the
repository import task, but since it doesn't access any repository storage path
it can stay.

1 files changed, 14 insertions, 15 deletions

diff --git a/spec/lib/gitlab/git_access_spec.rb b/spec/lib/gitlab/git_access_spec.rb
index dbd64c4bec0..e7da5565c26 100644
--- a/spec/lib/gitlab/git_access_spec.rb
+++ b/spec/lib/gitlab/git_access_spec.rb
@@ -2,6 +2,7 @@ require 'spec_helper'
 
 describe Gitlab::GitAccess do
   include TermsHelper
+  include GitHelpers
 
   let(:user) { create(:user) }
 
@@ -736,21 +737,19 @@ describe Gitlab::GitAccess do
 
     def merge_into_protected_branch
       @protected_branch_merge_commit ||= begin
-        Gitlab::GitalyClient::StorageSettings.allow_disk_access do
-          project.repository.add_branch(user, unprotected_branch, 'feature')
-          rugged = project.repository.rugged
-          target_branch = rugged.rev_parse('feature')
-          source_branch = project.repository.create_file(
-            user,
-            'filename',
-            'This is the file content',
-            message: 'This is a good commit message',
-            branch_name: unprotected_branch)
-          author = { email: "email@example.com", time: Time.now, name: "Example Git User" }
-
-          merge_index = rugged.merge_commits(target_branch, source_branch)
-          Rugged::Commit.create(rugged, author: author, committer: author, message: "commit message", parents: [target_branch, source_branch], tree: merge_index.write_tree(rugged))
-        end
+        project.repository.add_branch(user, unprotected_branch, 'feature')
+        rugged = rugged_repo(project.repository)
+        target_branch = rugged.rev_parse('feature')
+        source_branch = project.repository.create_file(
+          user,
+          'filename',
+          'This is the file content',
+          message: 'This is a good commit message',
+          branch_name: unprotected_branch)
+        author = { email: "email@example.com", time: Time.now, name: "Example Git User" }
+
+        merge_index = rugged.merge_commits(target_branch, source_branch)
+        Rugged::Commit.create(rugged, author: author, committer: author, message: "commit message", parents: [target_branch, source_branch], tree: merge_index.write_tree(rugged))
       end
     end