1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00

Merge branch 'update-omniauth' into dev

This commit is contained in:
Nicolas Florentin 2018-03-08 10:45:32 +01:00
commit e04bff99fa
2 changed files with 5 additions and 5 deletions

View File

@ -79,7 +79,7 @@ gem 'pg'
gem 'devise'
gem 'devise-async'
gem 'omniauth'
gem 'omniauth', '~> 1.3.2'
gem 'omniauth-oauth2'
gem 'rolify'

View File

@ -197,7 +197,7 @@ GEM
activerecord (>= 3.0)
hashdiff (0.3.0)
hashery (2.1.2)
hashie (3.4.2)
hashie (3.5.7)
highline (1.7.1)
hike (1.2.3)
hitimes (1.2.2)
@ -282,9 +282,9 @@ GEM
multi_xml (~> 0.5)
rack (~> 1.2)
oj (2.12.8)
omniauth (1.2.2)
omniauth (1.3.2)
hashie (>= 1.2, < 4)
rack (~> 1.0)
rack (>= 1.0, < 3)
omniauth-oauth2 (1.3.1)
oauth2 (~> 1.0)
omniauth (~> 1.2)
@ -534,7 +534,7 @@ DEPENDENCIES
minitest-reporters
notify_with
oj
omniauth
omniauth (~> 1.3.2)
omniauth-oauth2
openlab_ruby
pdf-reader