Commit 246ce5b5 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'zj-write-config' into 'master'

Write Config is mandatory

Closes gitaly#879

See merge request gitlab-org/gitlab-ce!20146
parents 0edc12b3 08554787
...@@ -1247,16 +1247,10 @@ module Gitlab ...@@ -1247,16 +1247,10 @@ module Gitlab
return unless full_path.present? return unless full_path.present?
# This guard avoids Gitaly log/error spam # This guard avoids Gitaly log/error spam
unless exists? raise NoRepository, 'repository does not exist' unless exists?
raise NoRepository, 'repository does not exist'
end
gitaly_migrate(:write_config) do |is_enabled| wrapped_gitaly_errors do
if is_enabled
gitaly_repository_client.write_config(full_path: full_path) gitaly_repository_client.write_config(full_path: full_path)
else
rugged_write_config(full_path: full_path)
end
end end
end end
......
...@@ -1871,7 +1871,6 @@ describe Gitlab::Git::Repository, seed_helper: true do ...@@ -1871,7 +1871,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
repository_rugged.config["gitlab.fullpath"] = repository_path repository_rugged.config["gitlab.fullpath"] = repository_path
end end
shared_examples 'writing repo config' do
context 'is given a path' do context 'is given a path' do
it 'writes it to disk' do it 'writes it to disk' do
repository.write_config(full_path: "not-the/real-path.git") repository.write_config(full_path: "not-the/real-path.git")
...@@ -1907,15 +1906,6 @@ describe Gitlab::Git::Repository, seed_helper: true do ...@@ -1907,15 +1906,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
end end
end end
context "when gitaly_write_config is enabled" do
it_behaves_like "writing repo config"
end
context "when gitaly_write_config is disabled", :disable_gitaly do
it_behaves_like "writing repo config"
end
end
describe '#merge' do describe '#merge' do
let(:repository) do let(:repository) do
Gitlab::Git::Repository.new('default', TEST_MUTABLE_REPO_PATH, '') Gitlab::Git::Repository.new('default', TEST_MUTABLE_REPO_PATH, '')
......
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