diff options
| author | Jesús Espino <jespinog@gmail.com> | 2018-05-29 16:58:12 +0200 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-05-29 15:58:12 +0100 |
| commit | e88fe4bb1dea4918284ee3c6e5aee5a8497ff2b8 (patch) | |
| tree | 480a5b91b37e2728ea151e3b7ad521aaf4402697 /app/permissions.go | |
| parent | bf4cefc3496686850757b2d44219ea2425871dda (diff) | |
| download | chat-e88fe4bb1dea4918284ee3c6e5aee5a8497ff2b8.tar.gz chat-e88fe4bb1dea4918284ee3c6e5aee5a8497ff2b8.tar.bz2 chat-e88fe4bb1dea4918284ee3c6e5aee5a8497ff2b8.zip | |
MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)
* MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions
* MM-8853: Removing unnecesary emoji enterprise feature
* Create emojis migration
* Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS always to system admins
* Simplifing permissions checks
* Revert "Simplifing permissions checks"
This reverts commit e2cafc1905fc9e20125dd9a1552d2d0c7340ae59.
Diffstat (limited to 'app/permissions.go')
| -rw-r--r-- | app/permissions.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/permissions.go b/app/permissions.go index 70b8cc689..46090070e 100644 --- a/app/permissions.go +++ b/app/permissions.go @@ -43,6 +43,7 @@ func (a *App) ResetPermissionsSystem() *model.AppError { // Now that the permissions system has been reset, re-run the migration to reinitialise it. a.DoAdvancedPermissionsMigration() + a.DoEmojisPermissionsMigration() return nil } |