IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-3.7' into master.

Browse Source
This commit is contained in:
George Goldberg
2017-03-17 16:29:26 +00:00
parent bfae88e60c 8568afe5b4
commit 7f266c1951
91 changed files with 941 additions and 801 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api4/apitestlib.go
View File

@@ -327,7 +327,7 @@ func (me *TestHelper) UpdateActiveUser(user *model.User, active bool) {
func LinkUserToTeam(user *model.User, team *model.Team) {
utils.DisableDebugLogForTest()
err := app.JoinUserToTeam(team, user)
err := app.JoinUserToTeam(team, user, utils.GetSiteURL())
if err != nil {
l4g.Error(err.Error())
l4g.Close()