ignore generation migrations
added missing res.error
added missing res.error
Merge branch 'oauth2provider'