diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-04-04 11:54:52 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-04-04 11:54:52 -0400 |
| commit | c7bdce8a6641ed8d361a43b6004a351535c78423 (patch) | |
| tree | f42d32d8a4d0cd4f702644dcb6a594f905f3f771 /app/import.go | |
| parent | 3a79e451ffe3ffe618311ee15b02dbebde6a77b0 (diff) | |
| download | chat-c7bdce8a6641ed8d361a43b6004a351535c78423.tar.gz chat-c7bdce8a6641ed8d361a43b6004a351535c78423.tar.bz2 chat-c7bdce8a6641ed8d361a43b6004a351535c78423.zip | |
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
Diffstat (limited to 'app/import.go')
| -rw-r--r-- | app/import.go | 4 |
1 files changed, 2 insertions, 2 deletions
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) } |