Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
No results found
Show changes
Commits on Source (2)
Hide whitespace changes
Inline Side-by-side
CHANGELOG.md
View file @ 4d6ea6d9
...@@ -2,6 +2,13 @@ ...@@ -2,6 +2,13 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
### [2.0.3](https://gitlab.nexdev.uk/pub/rails-base-image-builder/-/compare/v2.0.2...v2.0.3) (2021-12-15)
### Bug Fixes
* update rails to fix vulnerability in ActionPack ([43b2ec6](https://gitlab.nexdev.uk/pub/rails-base-image-builder/-/commit/43b2ec68a26bcf0f8ef88d276df17a2eca93744a))
### [2.0.2](https://gitlab.nexdev.uk/pub/rails-base-image-builder/-/compare/v2.0.1...v2.0.2) (2021-10-13) ### [2.0.2](https://gitlab.nexdev.uk/pub/rails-base-image-builder/-/compare/v2.0.1...v2.0.2) (2021-10-13)
......
Gemfile
View file @ 4d6ea6d9
...@@ -3,7 +3,7 @@ source 'https://rubygems.org' ...@@ -3,7 +3,7 @@ source 'https://rubygems.org'
ruby '2.7.2' ruby '2.7.2'
gem 'rails', '6.1.4.1' gem 'rails', '6.1.4.2'
gem 'puma', '4.3.9' gem 'puma', '4.3.9'
gem 'sass-rails', '5.1.0' gem 'sass-rails', '5.1.0'
gem 'uglifier', '4.2.0' gem 'uglifier', '4.2.0'
......
Gemfile.lock
View file @ 4d6ea6d9
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (6.1.4.1) actioncable (6.1.4.2)
actionpack (= 6.1.4.1) actionpack (= 6.1.4.2)
activesupport (= 6.1.4.1) activesupport (= 6.1.4.2)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (6.1.4.1) actionmailbox (6.1.4.2)
actionpack (= 6.1.4.1) actionpack (= 6.1.4.2)
activejob (= 6.1.4.1) activejob (= 6.1.4.2)
activerecord (= 6.1.4.1) activerecord (= 6.1.4.2)
activestorage (= 6.1.4.1) activestorage (= 6.1.4.2)
activesupport (= 6.1.4.1) activesupport (= 6.1.4.2)
mail (>= 2.7.1) mail (>= 2.7.1)
actionmailer (6.1.4.1) actionmailer (6.1.4.2)
actionpack (= 6.1.4.1) actionpack (= 6.1.4.2)
actionview (= 6.1.4.1) actionview (= 6.1.4.2)
activejob (= 6.1.4.1) activejob (= 6.1.4.2)
activesupport (= 6.1.4.1) activesupport (= 6.1.4.2)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (6.1.4.1) actionpack (6.1.4.2)
actionview (= 6.1.4.1) actionview (= 6.1.4.2)
activesupport (= 6.1.4.1) activesupport (= 6.1.4.2)
rack (~> 2.0, >= 2.0.9) rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionpack-cloudflare (1.1.0) actionpack-cloudflare (1.1.0)
actionpack (>= 3.2) actionpack (>= 3.2)
actiontext (6.1.4.1) actiontext (6.1.4.2)
actionpack (= 6.1.4.1) actionpack (= 6.1.4.2)
activerecord (= 6.1.4.1) activerecord (= 6.1.4.2)
activestorage (= 6.1.4.1) activestorage (= 6.1.4.2)
activesupport (= 6.1.4.1) activesupport (= 6.1.4.2)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (6.1.4.1) actionview (6.1.4.2)
activesupport (= 6.1.4.1) activesupport (= 6.1.4.2)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
...@@ -46,22 +46,22 @@ GEM ...@@ -46,22 +46,22 @@ GEM
activemodel (>= 4.1, < 6.2) activemodel (>= 4.1, < 6.2)
case_transform (>= 0.2) case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3) jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activejob (6.1.4.1) activejob (6.1.4.2)
activesupport (= 6.1.4.1) activesupport (= 6.1.4.2)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (6.1.4.1) activemodel (6.1.4.2)
activesupport (= 6.1.4.1) activesupport (= 6.1.4.2)
activerecord (6.1.4.1) activerecord (6.1.4.2)
activemodel (= 6.1.4.1) activemodel (= 6.1.4.2)
activesupport (= 6.1.4.1) activesupport (= 6.1.4.2)
activestorage (6.1.4.1) activestorage (6.1.4.2)
actionpack (= 6.1.4.1) actionpack (= 6.1.4.2)
activejob (= 6.1.4.1) activejob (= 6.1.4.2)
activerecord (= 6.1.4.1) activerecord (= 6.1.4.2)
activesupport (= 6.1.4.1) activesupport (= 6.1.4.2)
marcel (~> 1.0.0) marcel (~> 1.0.0)
mini_mime (>= 1.1.0) mini_mime (>= 1.1.0)
activesupport (6.1.4.1) activesupport (6.1.4.2)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
...@@ -75,14 +75,14 @@ GEM ...@@ -75,14 +75,14 @@ GEM
autoprefixer-rails (10.3.3.0) autoprefixer-rails (10.3.3.0)
execjs (~> 2) execjs (~> 2)
aws-eventstream (1.2.0) aws-eventstream (1.2.0)
aws-partitions (1.514.0) aws-partitions (1.541.0)
aws-sdk-core (3.121.1) aws-sdk-core (3.124.0)
aws-eventstream (~> 1, >= 1.0.2) aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0) aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
jmespath (~> 1.0) jmespath (~> 1.0)
aws-sdk-kms (1.49.0) aws-sdk-kms (1.52.0)
aws-sdk-core (~> 3, >= 3.120.0) aws-sdk-core (~> 3, >= 3.122.0)
aws-sigv4 (~> 1.1) aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.92.0) aws-sdk-s3 (1.92.0)
aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-core (~> 3, >= 3.112.0)
...@@ -140,7 +140,7 @@ GEM ...@@ -140,7 +140,7 @@ GEM
generator_spec (0.9.4) generator_spec (0.9.4)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
railties (>= 3.0.0) railties (>= 3.0.0)
globalid (0.5.2) globalid (1.0.0)
activesupport (>= 5.0) activesupport (>= 5.0)
hashdiff (1.0.1) hashdiff (1.0.1)
hcaptcha (7.1.0) hcaptcha (7.1.0)
...@@ -150,7 +150,7 @@ GEM ...@@ -150,7 +150,7 @@ GEM
httparty (0.18.1) httparty (0.18.1)
mime-types (~> 3.0) mime-types (~> 3.0)
multi_xml (>= 0.5.2) multi_xml (>= 0.5.2)
i18n (1.8.10) i18n (1.8.11)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
ibsciss-middleware (0.4.2) ibsciss-middleware (0.4.2)
jmespath (1.4.0) jmespath (1.4.0)
...@@ -158,7 +158,7 @@ GEM ...@@ -158,7 +158,7 @@ GEM
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (2.5.1) json (2.6.1)
jsonapi-renderer (0.2.2) jsonapi-renderer (0.2.2)
jwt (2.2.3) jwt (2.2.3)
libv8 (8.4.255.0) libv8 (8.4.255.0)
...@@ -170,21 +170,21 @@ GEM ...@@ -170,21 +170,21 @@ GEM
activesupport (>= 4) activesupport (>= 4)
railties (>= 4) railties (>= 4)
request_store (~> 1.0) request_store (~> 1.0)
loofah (2.12.0) loofah (2.13.0)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.1) mail (2.7.1)
mini_mime (>= 0.1.1) mini_mime (>= 0.1.1)
marcel (1.0.2) marcel (1.0.2)
method_source (1.0.0) method_source (1.0.0)
mime-types (3.3.1) mime-types (3.4.1)
mime-types-data (~> 3.2015) mime-types-data (~> 3.2015)
mime-types-data (3.2021.0901) mime-types-data (3.2021.1115)
mini_mime (1.1.2) mini_mime (1.1.2)
mini_portile2 (2.6.1) mini_portile2 (2.6.1)
mini_racer (0.3.1) mini_racer (0.3.1)
libv8 (~> 8.4.255) libv8 (~> 8.4.255)
minitest (5.14.4) minitest (5.15.0)
msgpack (1.4.2) msgpack (1.4.2)
multi_xml (0.6.0) multi_xml (0.6.0)
mysql2 (0.5.3) mysql2 (0.5.3)
...@@ -212,7 +212,7 @@ GEM ...@@ -212,7 +212,7 @@ GEM
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
pundit-matchers (1.6.0) pundit-matchers (1.6.0)
rspec-rails (>= 3.0.0) rspec-rails (>= 3.0.0)
racc (1.5.2) racc (1.6.0)
rack (2.2.3) rack (2.2.3)
rack-attack (6.5.0) rack-attack (6.5.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
...@@ -220,20 +220,20 @@ GEM ...@@ -220,20 +220,20 @@ GEM
rack (>= 2.0.0) rack (>= 2.0.0)
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rails (6.1.4.1) rails (6.1.4.2)
actioncable (= 6.1.4.1) actioncable (= 6.1.4.2)
actionmailbox (= 6.1.4.1) actionmailbox (= 6.1.4.2)
actionmailer (= 6.1.4.1) actionmailer (= 6.1.4.2)
actionpack (= 6.1.4.1) actionpack (= 6.1.4.2)
actiontext (= 6.1.4.1) actiontext (= 6.1.4.2)
actionview (= 6.1.4.1) actionview (= 6.1.4.2)
activejob (= 6.1.4.1) activejob (= 6.1.4.2)
activemodel (= 6.1.4.1) activemodel (= 6.1.4.2)
activerecord (= 6.1.4.1) activerecord (= 6.1.4.2)
activestorage (= 6.1.4.1) activestorage (= 6.1.4.2)
activesupport (= 6.1.4.1) activesupport (= 6.1.4.2)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 6.1.4.1) railties (= 6.1.4.2)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5) rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1) actionpack (>= 5.0.1.rc1)
...@@ -244,9 +244,9 @@ GEM ...@@ -244,9 +244,9 @@ GEM
nokogiri (>= 1.6) nokogiri (>= 1.6)
rails-html-sanitizer (1.4.2) rails-html-sanitizer (1.4.2)
loofah (~> 2.3) loofah (~> 2.3)
railties (6.1.4.1) railties (6.1.4.2)
actionpack (= 6.1.4.1) actionpack (= 6.1.4.2)
activesupport (= 6.1.4.1) activesupport (= 6.1.4.2)
method_source method_source
rake (>= 0.13) rake (>= 0.13)
thor (~> 1.0) thor (~> 1.0)
...@@ -255,7 +255,7 @@ GEM ...@@ -255,7 +255,7 @@ GEM
rb-inotify (0.10.1) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
rbtree (0.4.4) rbtree (0.4.4)
redis (4.4.0) redis (4.5.1)
redis-actionpack (5.2.0) redis-actionpack (5.2.0)
actionpack (>= 5, < 7) actionpack (>= 5, < 7)
redis-rack (>= 2.1.0, < 3) redis-rack (>= 2.1.0, < 3)
...@@ -298,7 +298,7 @@ GEM ...@@ -298,7 +298,7 @@ GEM
rspec-expectations (~> 3.10) rspec-expectations (~> 3.10)
rspec-mocks (~> 3.10) rspec-mocks (~> 3.10)
rspec-support (~> 3.10) rspec-support (~> 3.10)
rspec-support (3.10.2) rspec-support (3.10.3)
ruby-mailchecker (4.0.11) ruby-mailchecker (4.0.11)
sass (3.7.4) sass (3.7.4)
sass-listen (~> 4.0.0) sass-listen (~> 4.0.0)
...@@ -321,7 +321,7 @@ GEM ...@@ -321,7 +321,7 @@ GEM
tilt tilt
serverengine (2.1.1) serverengine (2.1.1)
sigdump (~> 0.2.2) sigdump (~> 0.2.2)
set (1.0.1) set (1.0.2)
shoulda-matchers (4.5.1) shoulda-matchers (4.5.1)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
sigdump (0.2.4) sigdump (0.2.4)
...@@ -347,9 +347,9 @@ GEM ...@@ -347,9 +347,9 @@ GEM
sprockets (3.7.2) sprockets (3.7.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (> 1, < 3) rack (> 1, < 3)
sprockets-rails (3.2.2) sprockets-rails (3.4.2)
actionpack (>= 4.0) actionpack (>= 5.2)
activesupport (>= 4.0) activesupport (>= 5.2)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
strings-case (0.3.0) strings-case (0.3.0)
thor (1.1.0) thor (1.1.0)
...@@ -375,7 +375,7 @@ GEM ...@@ -375,7 +375,7 @@ GEM
websocket-driver (0.7.5) websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0) websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5) websocket-extensions (0.1.5)
zeitwerk (2.4.2) zeitwerk (2.5.1)
PLATFORMS PLATFORMS
ruby ruby
...@@ -412,7 +412,7 @@ DEPENDENCIES ...@@ -412,7 +412,7 @@ DEPENDENCIES
pundit-matchers (= 1.6.0) pundit-matchers (= 1.6.0)
rack-attack (= 6.5.0) rack-attack (= 6.5.0)
rack-cors (= 1.1.1) rack-cors (= 1.1.1)
rails (= 6.1.4.1) rails (= 6.1.4.2)
rails-controller-testing (= 1.0.5) rails-controller-testing (= 1.0.5)
redis-rails (= 5.0.2) redis-rails (= 5.0.2)
rqrcode_png (= 0.1.5) rqrcode_png (= 0.1.5)
......