diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-12-19 20:33:14 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-01-02 17:36:39 +0000 |
| commit | 2e81e2f51c75320081a06dd94fdfa4745b9e80cd (patch) | |
| tree | f4887d2c38196cf0f08ecdf2f417023e217e9d9f | |
| parent | d0e3e197046180b527655708d26d2a9317dcd686 (diff) | |
| download | gitlab-ce-2e81e2f51c75320081a06dd94fdfa4745b9e80cd.tar.gz | |
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
(cherry picked from commit 2a9ba34dde0058c94caa696b2be1e53687faf0d0)
ecb847fd Add FakeApplicationSettings#commit_email_hostname
| -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 |