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 /web | |
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 'web')
-rw-r--r-- | web/web_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/web_test.go b/web/web_test.go index 03cacdddf..a977a113e 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -72,7 +72,7 @@ func TestIncomingWebhook(t *testing.T) { team := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: "test@nowhere.com", Type: model.TEAM_OPEN} team = ApiClient.Must(ApiClient.CreateTeam(team)).Data.(*model.Team) - app.JoinUserToTeam(team, user, utils.GetSiteURL()) + app.JoinUserToTeam(team, user) app.UpdateUserRoles(user.Id, model.ROLE_SYSTEM_ADMIN.Id) ApiClient.SetTeamId(team.Id) |