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 /api4/channel_test.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 'api4/channel_test.go')
| -rw-r--r-- | api4/channel_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api4/channel_test.go b/api4/channel_test.go index 0496be495..c5deda83e 100644 --- a/api4/channel_test.go +++ b/api4/channel_test.go @@ -680,7 +680,7 @@ func TestDeleteChannel(t *testing.T) { if ch, err := app.GetChannel(publicChannel1.Id); err == nil && ch.DeleteAt == 0 { t.Fatal("should have failed to get deleted channel") - } else if err := app.JoinChannel(ch, user2.Id, ""); err == nil { + } else if err := app.JoinChannel(ch, user2.Id); err == nil { t.Fatal("should have failed to join deleted channel") } |