Skip to content

Commit

Permalink
Release 28/01/21 (#764)
Browse files Browse the repository at this point in the history
* Make subscription queries comply with ES7 (#757)

* Make subscription queries comply with ES7

* Remove unused constant

* Refactor SubscriptionFinder

* Bump up Ruby version (#759)

* Update vulnerable gem versions (#763)
  • Loading branch information
rafa-garcia authored Mar 1, 2021
1 parent f7dcc08 commit 0183435
Show file tree
Hide file tree
Showing 16 changed files with 33 additions and 24 deletions.
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ gem 'figaro'
gem 'friendly_id'
gem 'immutable-struct'

gem 'nokogiri', '1.10.8'
gem 'nokogiri', '1.11.1'

# Authentication & authorisation
gem 'devise', '4.7.2'
gem 'devise', github: 'heartcombo/devise', branch: 'ca-omniauth-2'
gem 'devise-async'
gem 'hawk-auth'
gem 'omniauth'
gem 'omniauth-oauth2'
gem 'omniauth', '2.0.3'
gem 'omniauth-oauth2', '1.7.1'
gem 'pundit', require: true

# Rendering
Expand Down
49 changes: 29 additions & 20 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
GIT
remote: https://github.com/heartcombo/devise.git
revision: e16d60d0fedc5f5e6f541b2b9e901a2d53f8ceda
branch: ca-omniauth-2
specs:
devise (4.7.3)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)

GIT
remote: https://github.com/uktrade/export_components.git
revision: 379db7c53a1bb58639e678097364b4a7c4bea6f8
Expand Down Expand Up @@ -975,7 +987,7 @@ GEM
aws-sigv2 (1.0.1)
aws-sigv4 (1.1.3)
aws-eventstream (~> 1.0, >= 1.0.2)
bcrypt (3.1.15)
bcrypt (3.1.16)
bindex (0.8.1)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
Expand Down Expand Up @@ -1013,12 +1025,6 @@ GEM
addressable
database_cleaner (1.8.5)
debug_inspector (0.0.3)
devise (4.7.2)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
devise-async (1.0.0)
activejob (>= 5.0)
devise (>= 4.0)
Expand Down Expand Up @@ -1137,7 +1143,7 @@ GEM
mime-types-data (3.2020.0512)
mimemagic (0.3.5)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
mini_portile2 (2.5.0)
minitest (5.14.2)
mock_redis (0.23.0)
multi_json (1.15.0)
Expand All @@ -1148,8 +1154,9 @@ GEM
thor (~> 0.19)
netrc (0.11.0)
nio4r (2.5.4)
nokogiri (1.10.8)
mini_portile2 (~> 2.4.0)
nokogiri (1.11.1)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
normalize-scss (7.0.1)
sass (~> 3.3)
oauth2 (1.4.4)
Expand All @@ -1158,12 +1165,13 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
omniauth (1.9.1)
omniauth (2.0.3)
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)
omniauth-oauth2 (1.6.0)
oauth2 (~> 1.1)
omniauth (~> 1.9)
rack-protection
omniauth-oauth2 (1.7.1)
oauth2 (~> 1.4)
omniauth (>= 1.9, < 3)
orm_adapter (0.5.0)
paper_trail (10.3.1)
activerecord (>= 4.2)
Expand Down Expand Up @@ -1206,6 +1214,7 @@ GEM
pundit-matchers (1.6.0)
rspec-rails (>= 3.0.0)
raabro (1.3.1)
racc (1.5.2)
rack (2.2.3)
rack-protection (2.0.8.1)
rack
Expand Down Expand Up @@ -1369,8 +1378,8 @@ GEM
unicode-display_width (1.6.1)
uniform_notifier (1.13.0)
vcr (5.1.0)
warden (1.2.8)
rack (>= 2.0.6)
warden (1.2.9)
rack (>= 2.0.9)
web-console (4.0.2)
actionview (>= 6.0.0)
activemodel (>= 6.0.0)
Expand Down Expand Up @@ -1406,7 +1415,7 @@ DEPENDENCIES
capybara-screenshot
ckeditor
database_cleaner
devise (= 4.7.2)
devise!
devise-async
devise-security (= 0.14.3)
elasticsearch-extensions
Expand Down Expand Up @@ -1434,10 +1443,10 @@ DEPENDENCIES
listen
mock_redis
neat (= 1.8.0)
nokogiri (= 1.10.8)
nokogiri (= 1.11.1)
normalize-scss
omniauth
omniauth-oauth2
omniauth (= 2.0.3)
omniauth-oauth2 (= 1.7.1)
paper_trail (= 10.3.1)
pg (= 1.1.4)
pg_search
Expand Down
Binary file removed vendor/cache/bcrypt-3.1.15.gem
Binary file not shown.
Binary file added vendor/cache/bcrypt-3.1.16.gem
Binary file not shown.
Binary file removed vendor/cache/devise-4.7.2.gem
Binary file not shown.
Binary file removed vendor/cache/mini_portile2-2.4.0.gem
Binary file not shown.
Binary file added vendor/cache/mini_portile2-2.5.0.gem
Binary file not shown.
Binary file removed vendor/cache/nokogiri-1.10.8.gem
Binary file not shown.
Binary file added vendor/cache/nokogiri-1.11.1-x86_64-darwin.gem
Binary file not shown.
Binary file removed vendor/cache/omniauth-1.9.1.gem
Binary file not shown.
Binary file added vendor/cache/omniauth-2.0.3.gem
Binary file not shown.
Binary file removed vendor/cache/omniauth-oauth2-1.6.0.gem
Binary file not shown.
Binary file added vendor/cache/omniauth-oauth2-1.7.1.gem
Binary file not shown.
Binary file added vendor/cache/racc-1.5.2.gem
Binary file not shown.
Binary file removed vendor/cache/warden-1.2.8.gem
Binary file not shown.
Binary file added vendor/cache/warden-1.2.9.gem
Binary file not shown.

0 comments on commit 0183435

Please sign in to comment.