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/import.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/import.go') diff --git a/app/import.go b/app/import.go index a5ed69843..8d1173c31 100644 --- a/app/import.go +++ b/app/import.go @@ -415,7 +415,7 @@ func ImportUser(data *UserImportData, dryRun bool) *model.AppError { return err } } else { - if _, err := UpdateUser(user, utils.GetSiteURL(), false); err != nil { + if _, err := UpdateUser(user, false); err != nil { return err } if _, err := UpdateUserRoles(user.Id, roles); err != nil { @@ -865,7 +865,7 @@ func OldImportUser(team *model.Team, user *model.User) *model.User { l4g.Error(utils.T("api.import.import_user.set_email.error"), cresult.Err) } - if err := JoinUserToTeam(team, user, utils.GetSiteURL()); err != nil { + if err := JoinUserToTeam(team, user); err != nil { l4g.Error(utils.T("api.import.import_user.join_team.error"), err) } -- cgit v1.2.3-1-g7c22