diff --git a/.travis.yml b/.travis.yml index 45666290e..a93e65d64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,7 +69,7 @@ script: - '[ ! -f .approvals ] || bundle exec approvals verify --ask false' - if [ "$KNAPSACK_PRO_CI_NODE_INDEX" == "0" ]; then yarn test --colors; fi - if [ "$KNAPSACK_PRO_CI_NODE_INDEX" == "0" ]; then ./cc-test-reporter format-coverage -t lcov -o coverage/codeclimate.lcov.json; fi - # - if [ "$KNAPSACK_PRO_CI_NODE_INDEX" == "1" ]; then bundle exec bundle-audit check --update --ignore CVE-2015-9284; fi + - if [ "$KNAPSACK_PRO_CI_NODE_INDEX" == "1" ]; then bundle exec bundle-audit check --update --ignore CVE-2015-9284; fi - if [ "$KNAPSACK_PRO_CI_NODE_INDEX" == "1" ]; then yarn build-storybook; fi - if [ "$KNAPSACK_PRO_CI_NODE_INDEX" == "2" ]; then bundle exec rails runner -e production 'puts "App booted successfully"'; fi - if [ "$KNAPSACK_PRO_CI_NODE_INDEX" == "2" ]; then bundle exec rspec spec/services/rss_reader_spec.rb; fi diff --git a/Gemfile b/Gemfile index 2eb0daf41..0ca14da6a 100644 --- a/Gemfile +++ b/Gemfile @@ -77,7 +77,7 @@ gem "pusher-push-notifications", "~> 1.1" # Pusher Push Notifications Ruby serve gem "rack-attack", "~> 6.3.1" # Used to throttle requests to prevent brute force attacks gem "rack-cors", "~> 1.1" # Middleware that will make Rack-based apps CORS compatible gem "rack-timeout", "~> 0.6" # Rack middleware which aborts requests that have been running for longer than a specified timeout -gem "rails", "~> 6.0.1" # Ruby on Rails +gem "rails", "~> 6.0.3" # Ruby on Rails gem "rails-settings-cached", ">= 2.1.1" # Settings plugin for Rails that makes managing a table of global key, value pairs easy. gem "ransack", "~> 2.3" # Searching and sorting gem "recaptcha", "~> 5.5", require: "recaptcha/rails" # Helpers for the reCAPTCHA API diff --git a/Gemfile.lock b/Gemfile.lock index fd9aeafcd..863e88029 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,58 +19,58 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (6.0.3.1) - actionpack (= 6.0.3.1) + actioncable (6.0.3.2) + actionpack (= 6.0.3.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.3.1) - actionpack (= 6.0.3.1) - activejob (= 6.0.3.1) - activerecord (= 6.0.3.1) - activestorage (= 6.0.3.1) - activesupport (= 6.0.3.1) + actionmailbox (6.0.3.2) + actionpack (= 6.0.3.2) + activejob (= 6.0.3.2) + activerecord (= 6.0.3.2) + activestorage (= 6.0.3.2) + activesupport (= 6.0.3.2) mail (>= 2.7.1) - actionmailer (6.0.3.1) - actionpack (= 6.0.3.1) - actionview (= 6.0.3.1) - activejob (= 6.0.3.1) + actionmailer (6.0.3.2) + actionpack (= 6.0.3.2) + actionview (= 6.0.3.2) + activejob (= 6.0.3.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.0.3.1) - actionview (= 6.0.3.1) - activesupport (= 6.0.3.1) + actionpack (6.0.3.2) + actionview (= 6.0.3.2) + activesupport (= 6.0.3.2) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.0.3.1) - actionpack (= 6.0.3.1) - activerecord (= 6.0.3.1) - activestorage (= 6.0.3.1) - activesupport (= 6.0.3.1) + actiontext (6.0.3.2) + actionpack (= 6.0.3.2) + activerecord (= 6.0.3.2) + activestorage (= 6.0.3.2) + activesupport (= 6.0.3.2) nokogiri (>= 1.8.5) - actionview (6.0.3.1) - activesupport (= 6.0.3.1) + actionview (6.0.3.2) + activesupport (= 6.0.3.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) active_record_union (1.3.0) activerecord (>= 4.0) - activejob (6.0.3.1) - activesupport (= 6.0.3.1) + activejob (6.0.3.2) + activesupport (= 6.0.3.2) globalid (>= 0.3.6) - activemodel (6.0.3.1) - activesupport (= 6.0.3.1) - activerecord (6.0.3.1) - activemodel (= 6.0.3.1) - activesupport (= 6.0.3.1) - activestorage (6.0.3.1) - actionpack (= 6.0.3.1) - activejob (= 6.0.3.1) - activerecord (= 6.0.3.1) + activemodel (6.0.3.2) + activesupport (= 6.0.3.2) + activerecord (6.0.3.2) + activemodel (= 6.0.3.2) + activesupport (= 6.0.3.2) + activestorage (6.0.3.2) + actionpack (= 6.0.3.2) + activejob (= 6.0.3.2) + activerecord (= 6.0.3.2) marcel (~> 0.3.1) - activesupport (6.0.3.1) + activesupport (6.0.3.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -472,7 +472,7 @@ GEM listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - loofah (2.5.0) + loofah (2.6.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.2.4) @@ -584,20 +584,20 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rack-timeout (0.6.0) - rails (6.0.3.1) - actioncable (= 6.0.3.1) - actionmailbox (= 6.0.3.1) - actionmailer (= 6.0.3.1) - actionpack (= 6.0.3.1) - actiontext (= 6.0.3.1) - actionview (= 6.0.3.1) - activejob (= 6.0.3.1) - activemodel (= 6.0.3.1) - activerecord (= 6.0.3.1) - activestorage (= 6.0.3.1) - activesupport (= 6.0.3.1) + rails (6.0.3.2) + actioncable (= 6.0.3.2) + actionmailbox (= 6.0.3.2) + actionmailer (= 6.0.3.2) + actionpack (= 6.0.3.2) + actiontext (= 6.0.3.2) + actionview (= 6.0.3.2) + activejob (= 6.0.3.2) + activemodel (= 6.0.3.2) + activerecord (= 6.0.3.2) + activestorage (= 6.0.3.2) + activesupport (= 6.0.3.2) bundler (>= 1.3.0) - railties (= 6.0.3.1) + railties (= 6.0.3.2) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) @@ -607,9 +607,9 @@ GEM rails-settings-cached (2.1.1) rails (>= 4.2.0) request_store - railties (6.0.3.1) - actionpack (= 6.0.3.1) - activesupport (= 6.0.3.1) + railties (6.0.3.2) + actionpack (= 6.0.3.2) + activesupport (= 6.0.3.2) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) @@ -965,7 +965,7 @@ DEPENDENCIES rack-cors (~> 1.1) rack-host-redirect (~> 1.3) rack-timeout (~> 0.6) - rails (~> 6.0.1) + rails (~> 6.0.3) rails-settings-cached (>= 2.1.1) ransack (~> 2.3) recaptcha (~> 5.5) diff --git a/vendor/cache/actioncable-6.0.3.1.gem b/vendor/cache/actioncable-6.0.3.1.gem deleted file mode 100644 index 66b16f8d0..000000000 Binary files a/vendor/cache/actioncable-6.0.3.1.gem and /dev/null differ diff --git a/vendor/cache/actioncable-6.0.3.2.gem b/vendor/cache/actioncable-6.0.3.2.gem new file mode 100644 index 000000000..70e9cad8a Binary files /dev/null and b/vendor/cache/actioncable-6.0.3.2.gem differ diff --git a/vendor/cache/actionmailbox-6.0.3.1.gem b/vendor/cache/actionmailbox-6.0.3.1.gem deleted file mode 100644 index b727a4361..000000000 Binary files a/vendor/cache/actionmailbox-6.0.3.1.gem and /dev/null differ diff --git a/vendor/cache/actionmailbox-6.0.3.2.gem b/vendor/cache/actionmailbox-6.0.3.2.gem new file mode 100644 index 000000000..d888b3657 Binary files /dev/null and b/vendor/cache/actionmailbox-6.0.3.2.gem differ diff --git a/vendor/cache/actionmailer-6.0.3.1.gem b/vendor/cache/actionmailer-6.0.3.1.gem deleted file mode 100644 index bbe9bb3f1..000000000 Binary files a/vendor/cache/actionmailer-6.0.3.1.gem and /dev/null differ diff --git a/vendor/cache/actionmailer-6.0.3.2.gem b/vendor/cache/actionmailer-6.0.3.2.gem new file mode 100644 index 000000000..885efef4c Binary files /dev/null and b/vendor/cache/actionmailer-6.0.3.2.gem differ diff --git a/vendor/cache/actionpack-6.0.3.1.gem b/vendor/cache/actionpack-6.0.3.1.gem deleted file mode 100644 index e187a5dd7..000000000 Binary files a/vendor/cache/actionpack-6.0.3.1.gem and /dev/null differ diff --git a/vendor/cache/actionpack-6.0.3.2.gem b/vendor/cache/actionpack-6.0.3.2.gem new file mode 100644 index 000000000..6619ab975 Binary files /dev/null and b/vendor/cache/actionpack-6.0.3.2.gem differ diff --git a/vendor/cache/actiontext-6.0.3.1.gem b/vendor/cache/actiontext-6.0.3.1.gem deleted file mode 100644 index 0b18092dd..000000000 Binary files a/vendor/cache/actiontext-6.0.3.1.gem and /dev/null differ diff --git a/vendor/cache/actiontext-6.0.3.2.gem b/vendor/cache/actiontext-6.0.3.2.gem new file mode 100644 index 000000000..424aed040 Binary files /dev/null and b/vendor/cache/actiontext-6.0.3.2.gem differ diff --git a/vendor/cache/actionview-6.0.3.1.gem b/vendor/cache/actionview-6.0.3.1.gem deleted file mode 100644 index 7485dae48..000000000 Binary files a/vendor/cache/actionview-6.0.3.1.gem and /dev/null differ diff --git a/vendor/cache/actionview-6.0.3.2.gem b/vendor/cache/actionview-6.0.3.2.gem new file mode 100644 index 000000000..7417423a0 Binary files /dev/null and b/vendor/cache/actionview-6.0.3.2.gem differ diff --git a/vendor/cache/activejob-6.0.3.1.gem b/vendor/cache/activejob-6.0.3.1.gem deleted file mode 100644 index 4aa0b8983..000000000 Binary files a/vendor/cache/activejob-6.0.3.1.gem and /dev/null differ diff --git a/vendor/cache/activejob-6.0.3.2.gem b/vendor/cache/activejob-6.0.3.2.gem new file mode 100644 index 000000000..04b8baa91 Binary files /dev/null and b/vendor/cache/activejob-6.0.3.2.gem differ diff --git a/vendor/cache/activemodel-6.0.3.1.gem b/vendor/cache/activemodel-6.0.3.1.gem deleted file mode 100644 index 9cedfb032..000000000 Binary files a/vendor/cache/activemodel-6.0.3.1.gem and /dev/null differ diff --git a/vendor/cache/activemodel-6.0.3.2.gem b/vendor/cache/activemodel-6.0.3.2.gem new file mode 100644 index 000000000..58930540c Binary files /dev/null and b/vendor/cache/activemodel-6.0.3.2.gem differ diff --git a/vendor/cache/activerecord-6.0.3.1.gem b/vendor/cache/activerecord-6.0.3.1.gem deleted file mode 100644 index ff3c1be2d..000000000 Binary files a/vendor/cache/activerecord-6.0.3.1.gem and /dev/null differ diff --git a/vendor/cache/activerecord-6.0.3.2.gem b/vendor/cache/activerecord-6.0.3.2.gem new file mode 100644 index 000000000..5136a608b Binary files /dev/null and b/vendor/cache/activerecord-6.0.3.2.gem differ diff --git a/vendor/cache/activestorage-6.0.3.1.gem b/vendor/cache/activestorage-6.0.3.1.gem deleted file mode 100644 index d67e0a37c..000000000 Binary files a/vendor/cache/activestorage-6.0.3.1.gem and /dev/null differ diff --git a/vendor/cache/activestorage-6.0.3.2.gem b/vendor/cache/activestorage-6.0.3.2.gem new file mode 100644 index 000000000..8bf008069 Binary files /dev/null and b/vendor/cache/activestorage-6.0.3.2.gem differ diff --git a/vendor/cache/activesupport-6.0.3.1.gem b/vendor/cache/activesupport-6.0.3.1.gem deleted file mode 100644 index c9fdab7db..000000000 Binary files a/vendor/cache/activesupport-6.0.3.1.gem and /dev/null differ diff --git a/vendor/cache/activesupport-6.0.3.2.gem b/vendor/cache/activesupport-6.0.3.2.gem new file mode 100644 index 000000000..81dd2183b Binary files /dev/null and b/vendor/cache/activesupport-6.0.3.2.gem differ diff --git a/vendor/cache/loofah-2.5.0.gem b/vendor/cache/loofah-2.5.0.gem deleted file mode 100644 index cf9c90f04..000000000 Binary files a/vendor/cache/loofah-2.5.0.gem and /dev/null differ diff --git a/vendor/cache/loofah-2.6.0.gem b/vendor/cache/loofah-2.6.0.gem new file mode 100644 index 000000000..5af006706 Binary files /dev/null and b/vendor/cache/loofah-2.6.0.gem differ diff --git a/vendor/cache/rails-6.0.3.1.gem b/vendor/cache/rails-6.0.3.1.gem deleted file mode 100644 index a1718f83e..000000000 Binary files a/vendor/cache/rails-6.0.3.1.gem and /dev/null differ diff --git a/vendor/cache/rails-6.0.3.2.gem b/vendor/cache/rails-6.0.3.2.gem new file mode 100644 index 000000000..bab339bca Binary files /dev/null and b/vendor/cache/rails-6.0.3.2.gem differ diff --git a/vendor/cache/railties-6.0.3.1.gem b/vendor/cache/railties-6.0.3.1.gem deleted file mode 100644 index 9a9dbb4e8..000000000 Binary files a/vendor/cache/railties-6.0.3.1.gem and /dev/null differ diff --git a/vendor/cache/railties-6.0.3.2.gem b/vendor/cache/railties-6.0.3.2.gem new file mode 100644 index 000000000..9065e1e82 Binary files /dev/null and b/vendor/cache/railties-6.0.3.2.gem differ