Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump omniauth-google-oauth2, omniauth-rails_csrf_protection and omniauth #241

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump omniauth-google-oauth2, omniauth-rails_csrf_protection and omniauth #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ gem 'devise', '~> 4.7.1'
gem 'omniauth-google-oauth2'
# https://github.com/omniauth/omniauth/pull/809#issuecomment-502079405
# https://github.com/omniauth/omniauth/wiki/Resolving-CVE-2015-9284#with-rails-applications
gem 'omniauth-rails_csrf_protection', '~> 0.1'
gem 'omniauth-rails_csrf_protection', '~> 1.0'
# devise doesn't yet support omniauth 2, so this is necessary until then
gem 'omniauth', '~> 1.9.1'
gem 'omniauth', '~> 2.0.4'
gem 'pundit', '~> 2.1.0'

gem 'rails_admin', '~> 2.0'
Expand Down
39 changes: 25 additions & 14 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.8)
concurrent-ruby (1.1.9)
crass (1.0.6)
devise (4.7.3)
bcrypt (~> 3.0)
Expand All @@ -103,15 +103,23 @@ GEM
erubi (1.10.0)
erubis (2.7.0)
execjs (2.7.0)
faraday (1.4.1)
faraday (1.5.1)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
faraday-httpclient (~> 1.0.1)
faraday-net_http (~> 1.0)
faraday-net_http_persistent (~> 1.1)
faraday-patron (~> 1.0)
multipart-post (>= 1.2, < 3)
ruby2_keywords (>= 0.0.4)
faraday-em_http (1.0.0)
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-httpclient (1.0.1)
faraday-net_http (1.0.1)
faraday-net_http_persistent (1.1.0)
faraday-net_http_persistent (1.2.0)
faraday-patron (1.0.0)
ffi (1.15.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
Expand Down Expand Up @@ -158,23 +166,23 @@ GEM
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.9.1)
loofah (2.10.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (1.0.1)
method_source (1.0.0)
mini_mime (1.1.0)
mini_portile2 (2.5.1)
mini_portile2 (2.5.3)
minitest (5.14.4)
msgpack (1.4.2)
multi_json (1.15.0)
multi_xml (0.6.0)
multipart-post (2.1.1)
nested_form (0.3.2)
nio4r (2.5.7)
nokogiri (1.11.5)
nokogiri (1.11.7)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
oauth2 (1.4.7)
Expand All @@ -183,20 +191,21 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
omniauth (1.9.1)
omniauth (2.0.4)
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)
omniauth-google-oauth2 (0.8.2)
rack-protection
omniauth-google-oauth2 (1.0.0)
jwt (>= 2.0)
oauth2 (~> 1.1)
omniauth (~> 1.1)
omniauth-oauth2 (>= 1.6)
omniauth (~> 2.0)
omniauth-oauth2 (~> 1.7.1)
omniauth-oauth2 (1.7.1)
oauth2 (~> 1.4)
omniauth (>= 1.9, < 3)
omniauth-rails_csrf_protection (0.1.2)
omniauth-rails_csrf_protection (1.0.0)
actionpack (>= 4.2)
omniauth (>= 1.3.1)
omniauth (~> 2.0)
orm_adapter (0.5.0)
paper_trail (11.1.0)
activerecord (>= 5.2)
Expand Down Expand Up @@ -225,6 +234,8 @@ GEM
rack-pjax (1.1.0)
nokogiri (~> 1.5)
rack (>= 1.1)
rack-protection (2.1.0)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.0.3.7)
Expand Down Expand Up @@ -365,9 +376,9 @@ DEPENDENCIES
jbuilder (~> 2.10)
jquery-rails
listen (>= 3.0.5, < 3.2)
omniauth (~> 1.9.1)
omniauth (~> 2.0.4)
omniauth-google-oauth2
omniauth-rails_csrf_protection (~> 0.1)
omniauth-rails_csrf_protection (~> 1.0)
paper_trail (~> 11.1.0)
paper_trail-association_tracking (~> 2.1.1)
phony_rails
Expand Down