Commit 2a9ba34d authored by Stan Hu's avatar Stan Hu

Merge branch '54953-fix-commit_email_hostname-accessor-in-fake_application_settings' into 'master'

Add FakeApplicationSettings#commit_email_hostname

Closes #54953

See merge request gitlab-org/gitlab-ce!23939
parents 8f2911ca ecb847fd
---
title: Fix a 500 error that could occur until all migrations are done
merge_request: 23939
author:
type: fixed
......@@ -37,5 +37,9 @@ module Gitlab
def pick_repository_storage
repository_storages.sample
end
def commit_email_hostname
super.presence || ApplicationSetting.default_commit_email_hostname
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment