summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-08-09 18:14:04 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-08-09 18:14:04 +0000
commit2925850ceec3ef89eb1f60b0a648dbc5f72d8683 (patch)
tree9b898331f5fdf720c687dd20eedffafe6f2b8fc2
parenteaf5cc9907b5463a147a902827f7c98ade9bd1c6 (diff)
parent11eda5c255f71f6daf92bd59203e33e121d1d691 (diff)
downloadgitlab-ce-2925850ceec3ef89eb1f60b0a648dbc5f72d8683.tar.gz
Merge branch 'gitaly-repository-exists' into 'master'32665-make-project-and-features-visibility-settings-less-confusing
Rename RPC 'Exists' to 'RepositoryExists' See merge request !13277
-rw-r--r--lib/gitlab/gitaly_client/repository_service.rb2
-rw-r--r--spec/lib/gitlab/gitaly_client/repository_service_spec.rb19
2 files changed, 1 insertions, 20 deletions
diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb
index 79ce784f2f2..6ad97e62941 100644
--- a/lib/gitlab/gitaly_client/repository_service.rb
+++ b/lib/gitlab/gitaly_client/repository_service.rb
@@ -10,7 +10,7 @@ module Gitlab
def exists?
request = Gitaly::RepositoryExistsRequest.new(repository: @gitaly_repo)
- GitalyClient.call(@storage, :repository_service, :exists, request).exists
+ GitalyClient.call(@storage, :repository_service, :repository_exists, request).exists
end
def garbage_collect(create_bitmap)
diff --git a/spec/lib/gitlab/gitaly_client/repository_service_spec.rb b/spec/lib/gitlab/gitaly_client/repository_service_spec.rb
deleted file mode 100644
index 5c9c4ed1d7c..00000000000
--- a/spec/lib/gitlab/gitaly_client/repository_service_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::GitalyClient::RepositoryService do
- set(:project) { create(:project) }
- let(:storage_name) { project.repository_storage }
- let(:relative_path) { project.path_with_namespace + '.git' }
- let(:client) { described_class.new(project.repository) }
-
- describe '#exists?' do
- it 'sends an exists message' do
- expect_any_instance_of(Gitaly::RepositoryService::Stub)
- .to receive(:exists)
- .with(gitaly_request_with_path(storage_name, relative_path), kind_of(Hash))
- .and_call_original
-
- client.exists?
- end
- end
-end