Merge branch 'master' into ca-omniauth-2

This commit is contained in:
Carlos Antonio da Silva
2021-02-01 11:50:38 -03:00
19 changed files with 110 additions and 1284 deletions

View File

@@ -215,7 +215,7 @@ DEPENDENCIES
activemodel-serializers-xml!
devise!
mocha (~> 1.1)
omniauth
omniauth (~> 1.0)
omniauth-facebook
omniauth-oauth2
omniauth-openid
@@ -228,4 +228,4 @@ DEPENDENCIES
webrat (= 0.7.3)
BUNDLED WITH
1.17.3
2.2.7