summaryrefslogtreecommitdiffstats
path: root/app/emoji.go
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2017-07-04 06:37:52 -0700
committerHarrison Healey <harrisonmhealey@gmail.com>2017-07-04 09:37:52 -0400
commit1858fba7d48d4d09094ad1e8ea04a5f2720bd11a (patch)
treeadba7af284e4977880aa015b6c6c1631e27c848b /app/emoji.go
parent29b98ec383e47f28e7e190434f872072815cb6cb (diff)
downloadchat-1858fba7d48d4d09094ad1e8ea04a5f2720bd11a.tar.gz
chat-1858fba7d48d4d09094ad1e8ea04a5f2720bd11a.tar.bz2
chat-1858fba7d48d4d09094ad1e8ea04a5f2720bd11a.zip
Removing unnessisary go routines to fix random test failure. (#6838)
Diffstat (limited to 'app/emoji.go')
-rw-r--r--app/emoji.go7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/emoji.go b/app/emoji.go
index 564085d82..f1362b798 100644
--- a/app/emoji.go
+++ b/app/emoji.go
@@ -16,10 +16,11 @@ import (
l4g "github.com/alecthomas/log4go"
+ "image/color/palette"
+
"github.com/disintegration/imaging"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils"
- "image/color/palette"
)
const (
@@ -131,8 +132,8 @@ func DeleteEmoji(emoji *model.Emoji) *model.AppError {
return err
}
- go deleteEmojiImage(emoji.Id)
- go deleteReactionsForEmoji(emoji.Name)
+ deleteEmojiImage(emoji.Id)
+ deleteReactionsForEmoji(emoji.Name)
return nil
}