cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/2802'

Browse source
This commit is contained in:
Tom Hughes 2020-08-31 08:29:05 +01:00
commit 61c3d97a8a
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Gemfile.lock
View file

@ -249,7 +249,7 @@ GEM
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (2.3.1) json (2.3.1)
jwt (2.2.1) jwt (2.2.2)
kgio (2.11.3) kgio (2.11.3)
kramdown (2.3.0) kramdown (2.3.0)
rexml rexml
@ -300,7 +300,7 @@ GEM
omniauth (1.9.1) omniauth (1.9.1)
hashie (>= 3.4.6) hashie (>= 3.4.6)
rack (>= 1.6.2, < 3) rack (>= 1.6.2, < 3)
omniauth-facebook (6.0.0) omniauth-facebook (7.0.0)
omniauth-oauth2 (~> 1.2) omniauth-oauth2 (~> 1.2)
omniauth-github (1.4.0) omniauth-github (1.4.0)
omniauth (~> 1.5) omniauth (~> 1.5)
@ -315,8 +315,8 @@ GEM
omniauth-oauth (1.1.0) omniauth-oauth (1.1.0)
oauth oauth
omniauth (~> 1.0) omniauth (~> 1.0)
omniauth-oauth2 (1.6.0) omniauth-oauth2 (1.7.0)
oauth2 (~> 1.1) oauth2 (~> 1.4)
omniauth (~> 1.9) omniauth (~> 1.9)
omniauth-openid (1.0.1) omniauth-openid (1.0.1)
omniauth (~> 1.0) omniauth (~> 1.0)