From 4bff4c9d5b0af4ef2b98fad3bd8491bd5f88bf49 Mon Sep 17 00:00:00 2001 From: bilal Date: Mon, 29 Jun 2020 13:02:24 +0200 Subject: [PATCH 1/3] update rails --- Gemfile | 2 +- Gemfile.lock | 130 +++++++++++++++++++++++++-------------------------- 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/Gemfile b/Gemfile index 7c011f9..4b30193 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby "2.6.3" # Bundle edge Rails instead: gem "rails", github: "rails/rails" -gem "rails", "~> 6.0.0" +gem "rails", "~> 6.0.3.1" # Use postgresql as the database for Active Record gem "pg", "~> 0.18" # Use Puma as the app server diff --git a/Gemfile.lock b/Gemfile.lock index b1f67d7..25f6e5e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,71 +44,71 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.0.3) - actioncable (6.0.0) - actionpack (= 6.0.0) + actioncable (6.0.3.2) + actionpack (= 6.0.3.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.0.0) - actionpack (= 6.0.0) - activejob (= 6.0.0) - activerecord (= 6.0.0) - activestorage (= 6.0.0) - activesupport (= 6.0.0) + 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.0) - actionpack (= 6.0.0) - actionview (= 6.0.0) - activejob (= 6.0.0) + 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.0) - actionview (= 6.0.0) - activesupport (= 6.0.0) - rack (~> 2.0) + 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.0) - actionpack (= 6.0.0) - activerecord (= 6.0.0) - activestorage (= 6.0.0) - activesupport (= 6.0.0) + 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.0) - activesupport (= 6.0.0) + 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_storage_base64 (1.0.0) rails (~> 6.0) - activejob (6.0.0) - activesupport (= 6.0.0) + activejob (6.0.3.2) + activesupport (= 6.0.3.2) globalid (>= 0.3.6) - activemodel (6.0.0) - activesupport (= 6.0.0) + activemodel (6.0.3.2) + activesupport (= 6.0.3.2) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (6.0.0) - activemodel (= 6.0.0) - activesupport (= 6.0.0) + activerecord (6.0.3.2) + activemodel (= 6.0.3.2) + activesupport (= 6.0.3.2) activeresource (5.1.0) activemodel (>= 5.0, < 7) activemodel-serializers-xml (~> 1.0) activesupport (>= 5.0, < 7) - activestorage (6.0.0) - actionpack (= 6.0.0) - activejob (= 6.0.0) - activerecord (= 6.0.0) + 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.0) + activesupport (6.0.3.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 2.1, >= 2.1.8) + zeitwerk (~> 2.2, >= 2.2.2) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) afm (0.2.2) @@ -181,7 +181,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) connection_pool (2.2.2) countries (2.1.4) i18n_data (~> 0.8.0) @@ -230,7 +230,7 @@ GEM hubspot-ruby (0.9.0) activesupport (>= 3.0.0) httparty (>= 0.10.0) - i18n (1.8.2) + i18n (1.8.3) concurrent-ruby (~> 1.0) i18n_data (0.8.0) i18n_yaml_sorter (0.2.0) @@ -270,22 +270,22 @@ GEM ruby_dep (~> 1.2) loaf (0.8.1) rails (>= 3.2) - loofah (2.4.0) + loofah (2.6.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) - method_source (0.9.2) + method_source (1.0.0) mime-types (3.3) mime-types-data (~> 3.2015) mime-types-data (3.2019.0904) - mimemagic (0.3.3) + mimemagic (0.3.5) mini_magick (4.9.5) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.14.0) + minitest (5.14.1) monetize (1.9.2) money (~> 6.12) money (6.13.4) @@ -298,8 +298,8 @@ GEM msgpack (1.3.1) multi_xml (0.6.0) multipart-post (2.1.1) - nio4r (2.5.1) - nokogiri (1.10.7) + nio4r (2.5.2) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) oath (1.1.0) bcrypt @@ -337,20 +337,20 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (6.0.0) - actioncable (= 6.0.0) - actionmailbox (= 6.0.0) - actionmailer (= 6.0.0) - actionpack (= 6.0.0) - actiontext (= 6.0.0) - actionview (= 6.0.0) - activejob (= 6.0.0) - activemodel (= 6.0.0) - activerecord (= 6.0.0) - activestorage (= 6.0.0) - activesupport (= 6.0.0) + 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.0) + railties (= 6.0.3.2) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.4) actionpack (>= 5.0.1.x) @@ -363,9 +363,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (6.0.0) - actionpack (= 6.0.0) - activesupport (= 6.0.0) + 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) @@ -469,7 +469,7 @@ GEM turbolinks-source (5.2.0) typhoeus (1.3.1) ethon (>= 0.9.0) - tzinfo (1.2.6) + tzinfo (1.2.7) thread_safe (~> 0.1) uglifier (4.1.20) execjs (>= 0.3.0, < 3) @@ -494,9 +494,9 @@ GEM activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) - websocket-driver (0.7.1) + websocket-driver (0.7.2) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.4) + websocket-extensions (0.1.5) will_paginate (3.2.1) will_paginate-bootstrap4 (0.2.2) will_paginate (~> 3.0, >= 3.0.0) @@ -504,7 +504,7 @@ GEM wkhtmltopdf-heroku (2.12.5.0) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.2.2) + zeitwerk (2.3.1) PLATFORMS ruby @@ -561,7 +561,7 @@ DEPENDENCIES rack! rack-contrib (~> 2.0.1) rack-cors - rails (~> 6.0.0) + rails (~> 6.0.3.1) rails-controller-testing (~> 1.0.4) rails-data-migrations (~> 1.2.0) redcarpet (~> 3.4.0) -- 2.47.3 From 6831c66fda86ca0acb512237d1a0fcb29f38f5a0 Mon Sep 17 00:00:00 2001 From: bilal Date: Mon, 29 Jun 2020 14:11:07 +0200 Subject: [PATCH 2/3] add ActionMailbox::InboundEmail to total_storage spec --- spec/models/account_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb index 29e8eeb..247582e 100644 --- a/spec/models/account_spec.rb +++ b/spec/models/account_spec.rb @@ -133,7 +133,8 @@ RSpec.describe Account do ZoomMeeting, MedicalRelease, MiscRelease, - MatchingRequest + MatchingRequest, + ActionMailbox::InboundEmail ] Rails.application.eager_load! ActiveRecord::Base.descendants.each do |model| -- 2.47.3 From 6a0eb0dd06dad2d362a0cd0db9da084232233548 Mon Sep 17 00:00:00 2001 From: bilal Date: Mon, 29 Jun 2020 14:36:38 +0200 Subject: [PATCH 3/3] add comment --- spec/models/account_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb index 247582e..2acceb7 100644 --- a/spec/models/account_spec.rb +++ b/spec/models/account_spec.rb @@ -134,7 +134,7 @@ RSpec.describe Account do MedicalRelease, MiscRelease, MatchingRequest, - ActionMailbox::InboundEmail + ActionMailbox::InboundEmail # This is Rails model, we are not using it and it is NOT added to the Account#storage_total calculation ] Rails.application.eager_load! ActiveRecord::Base.descendants.each do |model| -- 2.47.3