diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-12-19 20:33:14 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-12-19 20:33:14 +0000 |
| commit | 2a9ba34dde0058c94caa696b2be1e53687faf0d0 (patch) | |
| tree | 28a9292a70e2e062040e7e14bcd7f2ffae9d2a3f | |
| parent | 8f2911ca0b290b9906e2d88776063201f540da19 (diff) | |
| parent | ecb847fd303f8daab91c224d747f086eefaeca7c (diff) | |
| download | gitlab-ce-2a9ba34dde0058c94caa696b2be1e53687faf0d0.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
| -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 |