diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-12-19 17:39:45 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-12-19 17:43:12 +0100 |
| commit | ecb847fd303f8daab91c224d747f086eefaeca7c (patch) | |
| tree | 394d32eb01287c0518781a0742fede820caa386a | |
| parent | 806ea5762baec558a85cd3edd36f82839bb1c904 (diff) | |
| download | gitlab-ce-ecb847fd303f8daab91c224d747f086eefaeca7c.tar.gz | |
Add FakeApplicationSettings#commit_email_hostname
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | changelogs/unreleased/54953-fix-commit_email_hostname-accessor-in-fake_application_settings.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/fake_application_settings.rb | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/changelogs/unreleased/54953-fix-commit_email_hostname-accessor-in-fake_application_settings.yml b/changelogs/unreleased/54953-fix-commit_email_hostname-accessor-in-fake_application_settings.yml new file mode 100644 index 00000000000..623b3a7319c --- /dev/null +++ b/changelogs/unreleased/54953-fix-commit_email_hostname-accessor-in-fake_application_settings.yml @@ -0,0 +1,5 @@ +--- +title: Fix a 500 error that could occur until all migrations are done +merge_request: 23939 +author: +type: fixed diff --git a/lib/gitlab/fake_application_settings.rb b/lib/gitlab/fake_application_settings.rb index db1aeeea8d3..bd806269bf0 100644 --- a/lib/gitlab/fake_application_settings.rb +++ b/lib/gitlab/fake_application_settings.rb @@ -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 |