RoleStore migration (#15017)

Automatic Merge

app/migrations.go

@@ -122,8 +122,8 @@ func (a *App) DoEmojisPermissionsMigration() {
 
 	if role != nil {
 		role.Permissions = append(role.Permissions, model.PERMISSION_CREATE_EMOJIS.Id, model.PERMISSION_DELETE_EMOJIS.Id)
-		if _, err = a.Srv().Store.Role().Save(role); err != nil {
-			mlog.Critical("Failed to migrate emojis creation permissions from mattermost config.", mlog.Err(err))
+		if _, nErr := a.Srv().Store.Role().Save(role); nErr != nil {
+			mlog.Critical("Failed to migrate emojis creation permissions from mattermost config.", mlog.Err(nErr))
 			return
 		}
 	}