root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

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
This commit is contained in:
Stan Hu 2018-12-19 20:33:14 +00:00
parent 8f2911ca0b ecb847fd30
commit 2a9ba34dde
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/54953-fix-commit_email_hostname-accessor-in-fake_application_settings.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Fix a 500 error that could occur until all migrations are done
merge_request: 23939
author:
type: fixed

4
lib/gitlab/fake_application_settings.rb
View File

@ -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