From c7bdce8a6641ed8d361a43b6004a351535c78423 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 4 Apr 2017 11:54:52 -0400 Subject: PLT-5900 Removed automatic configuration of SiteURL (#5952) * Revert "PLT-5765 Passed SiteURL to SendNotifications (#5705)" This reverts commit a8e68bd8905972ae59de90fa33d5b3e3c274dc47. * Removed automatic configuration of SiteURL * Reverted unintentional config changes * Updated help text * Added link to docs in Site URL warning * Fixed merge conflict --- app/apptestlib.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/apptestlib.go') diff --git a/app/apptestlib.go b/app/apptestlib.go index 561c98ed2..41e234130 100644 --- a/app/apptestlib.go +++ b/app/apptestlib.go @@ -161,7 +161,7 @@ func (me *TestHelper) CreatePost(channel *model.Channel) *model.Post { utils.DisableDebugLogForTest() var err *model.AppError - if post, err = CreatePost(post, channel.TeamId, false, utils.GetSiteURL()); err != nil { + if post, err = CreatePost(post, channel.TeamId, false); err != nil { l4g.Error(err.Error()) l4g.Close() time.Sleep(time.Second) @@ -174,7 +174,7 @@ func (me *TestHelper) CreatePost(channel *model.Channel) *model.Post { func LinkUserToTeam(user *model.User, team *model.Team) { utils.DisableDebugLogForTest() - err := JoinUserToTeam(team, user, utils.GetSiteURL()) + err := JoinUserToTeam(team, user) if err != nil { l4g.Error(err.Error()) l4g.Close() -- cgit v1.2.3-1-g7c22