From 2e81e2f51c75320081a06dd94fdfa4745b9e80cd Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Wed, 19 Dec 2018 20:33:14 +0000
Subject: 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
---
 lib/gitlab/fake_application_settings.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib')

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
-- 
cgit v1.2.3