VladPolskiy/gitlab-foss
1
0
Fork 0
mirror of https://gitlab.com/gitlab-org/gitlab-foss.git synced 2025-08-01 16:04:19 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add latest changes from gitlab-org/gitlab@master

Browse Source
This commit is contained in:
GitLab Bot
2024-09-17 15:07:18 +00:00
parent c394f78c5a
commit 19a229c898
48 changed files with 518 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gems/gitlab-backup-cli/lib/gitlab/backup/cli/targets/database.rb
View File

@ -70,7 +70,7 @@ module Gitlab
backup_connection = ::Backup::DatabaseConnection.new(database_connection_name)
backup_connection.restore_timeouts!
rescue ActiveRecord::ConnectionNotEstablished
raise ::Backup::DatabaseBackupError.new(
raise DatabaseBackupError.new(
backup_connection.database_configuration.activerecord_variables,
file_name(destination_dir, database_connection_name)
)
@ -245,7 +245,7 @@ module Gitlab
# Trigger a transaction snapshot export that will be used by pg_dump later on
backup_connection.export_snapshot!
rescue ActiveRecord::ConnectionNotEstablished
raise ::Backup::DatabaseBackupError.new(
raise DatabaseBackupError.new(
backup_connection.database_configuration.activerecord_variables,
file_name(destination_dir, database_connection_name)
)