diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-03-10 05:18:18 -0500 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-03-10 10:18:18 +0000 |
| commit | a8e68bd8905972ae59de90fa33d5b3e3c274dc47 (patch) | |
| tree | c809d33800262830f2497813fcea2c5bb482ac1b /app/slackimport.go | |
| parent | 43e5bbea372cb2c4a98d00fae19cdabd165a8f48 (diff) | |
| download | chat-a8e68bd8905972ae59de90fa33d5b3e3c274dc47.tar.gz chat-a8e68bd8905972ae59de90fa33d5b3e3c274dc47.tar.bz2 chat-a8e68bd8905972ae59de90fa33d5b3e3c274dc47.zip | |
PLT-5765 Passed SiteURL to SendNotifications (#5705)
Diffstat (limited to 'app/slackimport.go')
| -rw-r--r-- | app/slackimport.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/slackimport.go b/app/slackimport.go index 5512d8c00..ced0f6581 100644 --- a/app/slackimport.go +++ b/app/slackimport.go @@ -167,7 +167,7 @@ func SlackAddUsers(teamId string, slackusers []SlackUser, log *bytes.Buffer) map if result := <-Srv.Store.User().GetByEmail(email); result.Err == nil { existingUser := result.Data.(*model.User) addedUsers[sUser.Id] = existingUser - if err := JoinUserToTeam(team, addedUsers[sUser.Id]); err != nil { + if err := JoinUserToTeam(team, addedUsers[sUser.Id], utils.GetSiteURL()); err != nil { log.WriteString(utils.T("api.slackimport.slack_add_users.merge_existing_failed", map[string]interface{}{"Email": existingUser.Email, "Username": existingUser.Username})) } else { log.WriteString(utils.T("api.slackimport.slack_add_users.merge_existing", map[string]interface{}{"Email": existingUser.Email, "Username": existingUser.Username})) |