summaryrefslogtreecommitdiff
path: root/lib/tasks
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-09-06 03:12:08 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-09-06 03:12:08 +0000
commit091f92820381bde259de3d33571ee5102d54cb01 (patch)
treebac19e61eff6f97b1370d794a45ebf22faa826c0 /lib/tasks
parentf48ded4221ac830ff354693740cf919052359e00 (diff)
downloadgitlab-ce-091f92820381bde259de3d33571ee5102d54cb01.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/tasks')
-rw-r--r--lib/tasks/gitlab/db/validate_config.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/db/validate_config.rake b/lib/tasks/gitlab/db/validate_config.rake
index 2a3a54b5351..bf9ebc56486 100644
--- a/lib/tasks/gitlab/db/validate_config.rake
+++ b/lib/tasks/gitlab/db/validate_config.rake
@@ -144,7 +144,7 @@ namespace :gitlab do
rescue ActiveRecord::StatementInvalid => err
raise unless err.cause.is_a?(PG::ReadOnlySqlTransaction)
- warn "WARNING: Could not write to the database #{db_config.name}: #{err.message}"
+ warn "WARNING: Could not write to the database #{db_config.name}: cannot execute UPSERT in a read-only transaction"
end
def get_db_identifier(db_config)