diff options
| author | Jonathan <jonfritz@gmail.com> | 2018-02-13 15:17:29 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2018-02-13 15:17:29 -0500 |
| commit | bf1fdf92c71df29ddb7b0e31a00e218863c1158c (patch) | |
| tree | 56d24dd65c0b44797946bf3eff48c7c5804fbdb2 /model/channel_member_history.go | |
| parent | 5c560db8102b8ce6dc29bf91ab5e24ca4af66fdf (diff) | |
| download | chat-bf1fdf92c71df29ddb7b0e31a00e218863c1158c.tar.gz chat-bf1fdf92c71df29ddb7b0e31a00e218863c1158c.tar.bz2 chat-bf1fdf92c71df29ddb7b0e31a00e218863c1158c.zip | |
XYZ-110: Cherrypicking changes from release-4.7 to master (#8254)
* Cherry-picking 7b2861de3a09cf00d00b0872cc537d54302c4bfa to master because enterprise/master has code in it that enterprise/release-4.7 does not, and I don't want enterprise/master to break the next time somebody merges enterprise/release-4.7 to enterprise/master
* Renamed file to match existing scheme
(cherry picked from commit 8c22c5c6c6f835a6e73faf19036bad2a51bb9127)
Diffstat (limited to 'model/channel_member_history.go')
| -rw-r--r-- | model/channel_member_history.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/model/channel_member_history.go b/model/channel_member_history.go index 47c59d54e..55435c320 100644 --- a/model/channel_member_history.go +++ b/model/channel_member_history.go @@ -8,8 +8,4 @@ type ChannelMemberHistory struct { UserId string JoinTime int64 LeaveTime *int64 - - // these two fields are never set in the database - when we SELECT, we join on Users to get them - UserEmail string `db:"Email"` - Username string } |