diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2018-06-06 16:37:09 +0200 |
---|---|---|
committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-06-08 12:14:23 +0200 |
commit | 726e9e385baac5ef5a2dba7a58591414124f7a89 (patch) | |
tree | 957ab7f0c3082bc3d55efccefb3bc23461b6f486 | |
parent | aefe7981fc4a830b4fff59dc109125e826b6b5df (diff) | |
download | gitlab-ce-726e9e385baac5ef5a2dba7a58591414124f7a89.tar.gz |
Turn off strict check
-rw-r--r-- | lib/gitlab/gitaly_client.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/shell_spec.rb | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index 618f26d743f..36e9adf27da 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -36,7 +36,7 @@ module Gitlab # We have a mechanism to let GitLab automatically opt in to all Gitaly # features. We want to be able to exclude some features from automatic # opt-in. That is what EXPLICIT_OPT_IN_REQUIRED is for. - EXPLICIT_OPT_IN_REQUIRED = [] #Gitlab::GitalyClient::StorageSettings::DISK_ACCESS_DENIED_FLAG].freeze + EXPLICIT_OPT_IN_REQUIRED = [Gitlab::GitalyClient::StorageSettings::DISK_ACCESS_DENIED_FLAG].freeze MUTEX = Mutex.new diff --git a/spec/lib/gitlab/shell_spec.rb b/spec/lib/gitlab/shell_spec.rb index a21790cc070..155e1663298 100644 --- a/spec/lib/gitlab/shell_spec.rb +++ b/spec/lib/gitlab/shell_spec.rb @@ -680,7 +680,6 @@ describe Gitlab::Shell do describe '#import_repository' do let(:import_url) { 'https://gitlab.com/gitlab-org/gitlab-ce.git' } - context 'with gitaly' do it 'returns true when the command succeeds' do expect_any_instance_of(Gitlab::GitalyClient::RepositoryService).to receive(:import_repository).with(import_url) @@ -691,12 +690,10 @@ describe Gitlab::Shell do end it 'raises an exception when the command fails' do - expect_any_instance_of(Gitlab::GitalyClient::RepositoryService).to receive(:import_repository).with(import_url) { raise GRPC::BadStatus, 'bla' } + expect_any_instance_of(Gitlab::GitalyClient::RepositoryService).to receive(:import_repository) + .with(import_url) { raise GRPC::BadStatus, 'bla' } expect_any_instance_of(Gitlab::Shell::GitalyGitlabProjects).to receive(:output) { 'error'} - #allow(gitlab_projects).to receive(:output) { 'error' } - #expect(gitlab_projects).to receive(:import_project) { false } - expect do gitlab_shell.import_repository(project.repository_storage, project.disk_path, import_url) end.to raise_error(Gitlab::Shell::Error, "error") |