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/command_join.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/command_join.go')
-rw-r--r-- | app/command_join.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/command_join.go b/app/command_join.go index e7d25aa16..5b19dd7a0 100644 --- a/app/command_join.go +++ b/app/command_join.go @@ -45,7 +45,7 @@ func (me *JoinProvider) DoCommand(args *model.CommandArgs, message string) *mode return &model.CommandResponse{Text: args.T("api.command_join.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } - if err := JoinChannel(channel, args.UserId, args.SiteURL); err != nil { + if err := JoinChannel(channel, args.UserId); err != nil { return &model.CommandResponse{Text: args.T("api.command_join.fail.app_error"), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL} } |