summaryrefslogtreecommitdiff
path: root/spec/lib/backup
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-09-05 06:12:53 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-09-05 06:12:53 +0000
commit6d706d5dc036fb40f4d7b8e6619c3c78335620aa (patch)
treed29a01e9e54b831bc97d8defe122c3eaf8038551 /spec/lib/backup
parentee231234eb70b3a40d95c4874c6d6d1b2ca0a39d (diff)
downloadgitlab-ce-6d706d5dc036fb40f4d7b8e6619c3c78335620aa.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/backup')
-rw-r--r--spec/lib/backup/gitaly_backup_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/backup/gitaly_backup_spec.rb b/spec/lib/backup/gitaly_backup_spec.rb
index d427e41026e..6b0747735ed 100644
--- a/spec/lib/backup/gitaly_backup_spec.rb
+++ b/spec/lib/backup/gitaly_backup_spec.rb
@@ -17,7 +17,7 @@ RSpec.describe Backup::GitalyBackup do
let(:expected_env) do
{
'SSL_CERT_FILE' => Gitlab::X509::Certificate.default_cert_file,
- 'SSL_CERT_DIR' => Gitlab::X509::Certificate.default_cert_dir
+ 'SSL_CERT_DIR' => Gitlab::X509::Certificate.default_cert_dir
}.merge(ENV)
end
@@ -121,7 +121,7 @@ RSpec.describe Backup::GitalyBackup do
let(:ssl_env) do
{
'SSL_CERT_FILE' => '/some/cert/file',
- 'SSL_CERT_DIR' => '/some/cert'
+ 'SSL_CERT_DIR' => '/some/cert'
}
end