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 /cmd | |
| 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 'cmd')
| -rw-r--r-- | cmd/platform/channel.go | 2 | ||||
| -rw-r--r-- | cmd/platform/team.go | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cmd/platform/channel.go b/cmd/platform/channel.go index 550d0802e..cd8df0873 100644 --- a/cmd/platform/channel.go +++ b/cmd/platform/channel.go @@ -166,7 +166,7 @@ func removeUserFromChannel(channel *model.Channel, user *model.User, userArg str CommandPrintErrorln("Can't find user '" + userArg + "'") return } - if err := app.RemoveUserFromChannel(user.Id, "", channel, utils.GetSiteURL()); err != nil { + if err := app.RemoveUserFromChannel(user.Id, "", channel); err != nil { CommandPrintErrorln("Unable to remove '" + userArg + "' from " + channel.Name + ". Error: " + err.Error()) } } diff --git a/cmd/platform/team.go b/cmd/platform/team.go index 6dab2ad16..1dc5d46eb 100644 --- a/cmd/platform/team.go +++ b/cmd/platform/team.go @@ -8,7 +8,6 @@ import ( "github.com/mattermost/platform/app" "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" "github.com/spf13/cobra" ) @@ -155,7 +154,7 @@ func addUserToTeam(team *model.Team, user *model.User, userArg string) { CommandPrintErrorln("Can't find user '" + userArg + "'") return } - if err := app.JoinUserToTeam(team, user, utils.GetSiteURL()); err != nil { + if err := app.JoinUserToTeam(team, user); err != nil { CommandPrintErrorln("Unable to add '" + userArg + "' to " + team.Name) } } |