From c15b7cb3584fac752979212e6770bf7b1342456f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 07:11:35 +0000 Subject: [PATCH 001/117] Bump bootsnap from 1.17.0 to 1.17.1 Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.17.0 to 1.17.1. - [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.17.0...v1.17.1) --- updated-dependencies: - dependency-name: bootsnap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 804067b1a..6205ff014 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,7 +106,7 @@ GEM autoprefixer-rails (10.4.16.0) execjs (~> 2) bcrypt (3.1.20) - bootsnap (1.17.0) + bootsnap (1.17.1) msgpack (~> 1.2) bootstrap (5.0.2) autoprefixer-rails (>= 9.1.0) From 0e4d255ccc75553eae8976abfffcecaf51834b05 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jan 2024 07:21:42 +0000 Subject: [PATCH 002/117] Bump rubocop from 1.59.0 to 1.60.0 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.59.0 to 1.60.0. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.59.0...v1.60.0) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6205ff014..954134e69 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -275,8 +275,8 @@ GEM paper_trail (15.1.0) activerecord (>= 6.1) request_store (~> 1.4) - parallel (1.23.0) - parser (3.2.2.4) + parallel (1.24.0) + parser (3.3.0.4) ast (~> 2.4.1) racc pg (1.5.4) @@ -361,7 +361,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - regexp_parser (2.8.3) + regexp_parser (2.9.0) request_store (1.5.1) rack (>= 1.4) responders (3.1.1) @@ -393,11 +393,11 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.1) - rubocop (1.59.0) + rubocop (1.60.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.2.4) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) From 3e928eed4c893be1715c15c5d09aa0d560918593 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 07:46:07 +0000 Subject: [PATCH 003/117] Bump rubocop from 1.60.0 to 1.60.1 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.60.0 to 1.60.1. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.60.0...v1.60.1) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 954134e69..d0c6a1607 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -393,7 +393,7 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.1) - rubocop (1.60.0) + rubocop (1.60.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) From 477fbe49ee9a7599435988df2a30233001cedb42 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jan 2024 07:15:51 +0000 Subject: [PATCH 004/117] Bump rubocop from 1.60.1 to 1.60.2 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.60.1 to 1.60.2. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.60.1...v1.60.2) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d0c6a1607..4d84ba2d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -276,7 +276,7 @@ GEM activerecord (>= 6.1) request_store (~> 1.4) parallel (1.24.0) - parser (3.3.0.4) + parser (3.3.0.5) ast (~> 2.4.1) racc pg (1.5.4) @@ -393,7 +393,7 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.1) - rubocop (1.60.1) + rubocop (1.60.2) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) From f8a6804e5e26499b6247e4cbb7693d1d91791f84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 07:07:18 +0000 Subject: [PATCH 005/117] Bump rspec-rails from 6.1.0 to 6.1.1 Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 6.1.0 to 6.1.1. - [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v6.1.0...v6.1.1) --- updated-dependencies: - dependency-name: rspec-rails dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4d84ba2d8..94d7614d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -148,7 +148,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) countries (5.7.0) unaccent (~> 0.3) country_select (8.0.3) @@ -248,7 +248,7 @@ GEM mini_mime (1.1.5) mini_racer (0.8.0) libv8-node (~> 18.16.0.0) - minitest (5.20.0) + minitest (5.21.2) msgpack (1.7.2) nenv (0.3.0) net-imap (0.4.6) @@ -384,7 +384,7 @@ GEM rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-rails (6.1.0) + rspec-rails (6.1.1) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) From 9c40949aa43581bdb1bf547a0164a30dce7b1d61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jan 2024 07:15:40 +0000 Subject: [PATCH 006/117] Bump capybara from 3.39.2 to 3.40.0 Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.39.2 to 3.40.0. - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.39.2...3.40.0) --- updated-dependencies: - dependency-name: capybara dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 94d7614d5..044c7cc77 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -130,11 +130,11 @@ GEM capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - capybara (3.39.2) + capybara (3.40.0) addressable matrix mini_mime (>= 0.1.3) - nokogiri (~> 1.8) + nokogiri (~> 1.11) rack (>= 1.6.0) rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) From 6ab2348f05cc7964ad232cbe3498e9a0641be748 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 07:15:06 +0000 Subject: [PATCH 007/117] Bump bootsnap from 1.17.1 to 1.18.1 Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.17.1 to 1.18.1. - [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.17.1...v1.18.1) --- updated-dependencies: - dependency-name: bootsnap dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 044c7cc77..288db71e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,7 +106,7 @@ GEM autoprefixer-rails (10.4.16.0) execjs (~> 2) bcrypt (3.1.20) - bootsnap (1.17.1) + bootsnap (1.18.1) msgpack (~> 1.2) bootstrap (5.0.2) autoprefixer-rails (>= 9.1.0) From 86d6d41652c7dff8174e1ff5e4cb44232fb08dbd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 07:44:08 +0000 Subject: [PATCH 008/117] Bump bootsnap from 1.18.1 to 1.18.3 Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.18.1 to 1.18.3. - [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.18.1...v1.18.3) --- updated-dependencies: - dependency-name: bootsnap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 288db71e7..b7a958d3e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,7 +106,7 @@ GEM autoprefixer-rails (10.4.16.0) execjs (~> 2) bcrypt (3.1.20) - bootsnap (1.18.1) + bootsnap (1.18.3) msgpack (~> 1.2) bootstrap (5.0.2) autoprefixer-rails (>= 9.1.0) From dc7b6d99164289f6c36b08e98591f83d7b8c28ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 2 Feb 2024 07:08:25 +0000 Subject: [PATCH 009/117] Bump brakeman from 6.1.1 to 6.1.2 Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 6.1.1 to 6.1.2. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v6.1.1...v6.1.2) --- updated-dependencies: - dependency-name: brakeman dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index b7a958d3e..4ce1b96f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -112,7 +112,7 @@ GEM autoprefixer-rails (>= 9.1.0) popper_js (>= 2.9.2, < 3) sassc-rails (>= 2.0.0) - brakeman (6.1.1) + brakeman (6.1.2) racc builder (3.2.4) byebug (11.1.3) From b92536614c6c145d7ebed186a15ec64124ec08b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 07:38:26 +0000 Subject: [PATCH 010/117] Bump nokogiri from 1.16.0 to 1.16.2 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.16.0 to 1.16.2. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.16.0...v1.16.2) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4ce1b96f0..e7e18fb66 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -264,9 +264,9 @@ GEM net-protocol net-ssh (7.2.0) nio4r (2.7.0) - nokogiri (1.16.0-arm64-darwin) + nokogiri (1.16.2-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.0-x86_64-linux) + nokogiri (1.16.2-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) From 098e18b6cf76b79bdf6f1120cf3003d02bb18faa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 07:38:06 +0000 Subject: [PATCH 011/117] Bump pg from 1.5.4 to 1.5.5 Bumps [pg](https://github.com/ged/ruby-pg) from 1.5.4 to 1.5.5. - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.md) - [Commits](https://github.com/ged/ruby-pg/compare/v1.5.4...v1.5.5) --- updated-dependencies: - dependency-name: pg dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e7e18fb66..229db07de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -279,7 +279,7 @@ GEM parser (3.3.0.5) ast (~> 2.4.1) racc - pg (1.5.4) + pg (1.5.5) popper_js (2.11.8) premailer (1.22.0) addressable From 9ddf6b07f5595534f1be7a9b6add3b846bf2c435 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 07:22:30 +0000 Subject: [PATCH 012/117] Bump country_select from 8.0.3 to 9.0.0 Bumps [country_select](https://github.com/countries/country_select) from 8.0.3 to 9.0.0. - [Release notes](https://github.com/countries/country_select/releases) - [Changelog](https://github.com/countries/country_select/blob/master/CHANGELOG.md) - [Commits](https://github.com/countries/country_select/compare/v8.0.3...v9.0.0) --- updated-dependencies: - dependency-name: country_select dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e7e18fb66..fb83d0527 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -149,10 +149,10 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.2.3) - countries (5.7.0) + countries (6.0.0) unaccent (~> 0.3) - country_select (8.0.3) - countries (~> 5.0) + country_select (9.0.0) + countries (> 5.0, < 7.0) crass (1.0.6) css_parser (1.16.0) addressable From 6e603f695f8a83514afd341a640f665d5cc3af0f Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Thu, 22 Feb 2024 11:52:13 +0800 Subject: [PATCH 013/117] Fix arrow rendering --- app/assets/javascripts/crm.js.coffee | 4 ++-- app/helpers/application_helper.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/crm.js.coffee b/app/assets/javascripts/crm.js.coffee index 53f903e10..d095c8d3c 100644 --- a/app/assets/javascripts/crm.js.coffee +++ b/app/assets/javascripts/crm.js.coffee @@ -9,8 +9,8 @@ @[0].toUpperCase() + @.substring(1) window.crm = - EXPANDED: "▼" - COLLAPSED: "►" + EXPANDED: "▽" + COLLAPSED: "▷" searchRequest: null autocompleter: null base_url: "" diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 085267c68..79999b63c 100755 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -36,7 +36,7 @@ def show_flash(options = { sticky: false }) end def subtitle_link(id, text, hidden) - link_to("#{hidden ? '►' : '▼'} #{sanitize text}".html_safe, + link_to("#{hidden ? '▷' : '▽'} #{sanitize text}".html_safe, url_for(controller: :home, action: :toggle, id: id), remote: true, onclick: "crm.flip_subtitle(this)") @@ -99,7 +99,7 @@ def link_to_inline(id, url, options = {}) #---------------------------------------------------------------------------- def arrow_for(id) - content_tag(:span, "►".html_safe, id: "#{id}_arrow", class: :arrow) + content_tag(:span, "▷".html_safe, id: "#{id}_arrow", class: :arrow) end #---------------------------------------------------------------------------- From 48dd7ec6b6e9241d08155ec1d4a3861d93e95ab7 Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Thu, 22 Feb 2024 12:00:32 +0800 Subject: [PATCH 014/117] Tidy up unrelated comment --- app/views/contacts/show.js.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/contacts/show.js.haml b/app/views/contacts/show.js.haml index 4309fd899..a5d775e82 100644 --- a/app/views/contacts/show.js.haml +++ b/app/views/contacts/show.js.haml @@ -1,4 +1,4 @@ -- entity_name = controller.controller_name.singularize.underscore #account +- entity_name = controller.controller_name.singularize.underscore - @entity = instance_variable_get("@#{entity_name}") $('#main').html('#{ j (render template: "#{entity_name.pluralize}/show.html", entity_name => @entity) }'); From 45c6ca4148a8a7217ae2dd7a13fe5f656ad01344 Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Thu, 22 Feb 2024 12:31:39 +0800 Subject: [PATCH 015/117] Correct font-sizes for mobile views using dl layouts. --- app/assets/stylesheets/bootstrap-custom.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/bootstrap-custom.scss b/app/assets/stylesheets/bootstrap-custom.scss index 5e8b82cfa..daf01f372 100644 --- a/app/assets/stylesheets/bootstrap-custom.scss +++ b/app/assets/stylesheets/bootstrap-custom.scss @@ -165,12 +165,12 @@ button.navbar-toggler:focus { dl { li { width: 23%; - font-size: 2rem; + font-size: 1rem; dt { - font-size: inherit; + font-size: 0.75rem; } tt { - font-size: inherit; + font-size: 0.75rem; } } } From 0de5c5b425f0da7970ef2d81e415eb79b036de6e Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Thu, 22 Feb 2024 13:01:50 +0800 Subject: [PATCH 016/117] Removed border around 'remember me' and used primary button colour for Login button. --- app/assets/stylesheets/common.scss | 9 +++++++++ app/views/devise/sessions/new.html.haml | 9 ++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 9a7998f11..83af635de 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -784,3 +784,12 @@ table.asset_attributes { background-color: darkgray; } } + + +// Login page +.form-group.user_remember_me { + border: 0px; + .form-check { + padding-left: 6px; + } +} \ No newline at end of file diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index aa59d907c..c232eeee1 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -23,10 +23,9 @@ .label= t(:password) = f.input_field :password - %div(style="margin-left:12px") + .section = f.input :remember_me, as: :boolean, inline_label: t('remember_me') - %br - .buttonbar - = f.submit t(:login) - = t(:or) + = f.submit t(:login), class: 'btn btn-primary' + + .section = link_to t(:forgot_password) + '?', new_password_path(resource_name) From 4bef52f8795761bc8dde6b53843274112423da20 Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Thu, 22 Feb 2024 15:21:21 +0800 Subject: [PATCH 017/117] Fix layout of custom field inputs. Now consistent with other form inputs. --- app/views/fields/_group_table.html.haml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/fields/_group_table.html.haml b/app/views/fields/_group_table.html.haml index 4b9459459..a70350db8 100644 --- a/app/views/fields/_group_table.html.haml +++ b/app/views/fields/_group_table.html.haml @@ -8,6 +8,8 @@ - if field.as == 'check_boxes' - value = f.object.send(field.name) - checked = YAML.load(value.to_s) - = f.input field.name, field.input_options.merge(checked: checked) + .label.top + = "#{field.label}:" + = f.input_field field.name, field.input_options.merge(checked: checked) - if i == 0 %td= spacer From 0616327e6e871e9e99d3c573a28ffd85bb08d12b Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Fri, 23 Feb 2024 13:40:07 +0800 Subject: [PATCH 018/117] Fix case where entity is updated but the view doesn't refresh --- app/views/accounts/update.js.haml | 1 + app/views/campaigns/update.js.haml | 1 + app/views/contacts/update.js.haml | 1 + app/views/leads/update.js.haml | 1 + app/views/opportunities/update.js.haml | 1 + 5 files changed, 5 insertions(+) diff --git a/app/views/accounts/update.js.haml b/app/views/accounts/update.js.haml index 4ade5e61b..5074663b4 100755 --- a/app/views/accounts/update.js.haml +++ b/app/views/accounts/update.js.haml @@ -7,6 +7,7 @@ crm.flip_form('edit_#{entity_name}'); crm.set_title('edit_#{entity_name}', '#{j @entity.name}'); = refresh_sidebar(:show) + $('#summary').html('#{ j (render partial: "#{entity_name.pluralize}/sidebar_show", entity_name => @entity) }'); - else $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }'); $('##{id}').effect("highlight", { duration:1500 }); diff --git a/app/views/campaigns/update.js.haml b/app/views/campaigns/update.js.haml index 0d5bc2bd8..ef3eac94d 100755 --- a/app/views/campaigns/update.js.haml +++ b/app/views/campaigns/update.js.haml @@ -7,6 +7,7 @@ crm.flip_form('edit_#{entity_name}'); crm.set_title('edit_#{entity_name}', '#{h @entity.name}'); = refresh_sidebar(:show) + $('#summary').html('#{ j (render partial: "#{entity_name.pluralize}/sidebar_show", entity_name => @entity) }'); - else $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }'); $('##{id}').effect("highlight", { duration:1500 }); diff --git a/app/views/contacts/update.js.haml b/app/views/contacts/update.js.haml index 94801e5cd..ef8922340 100755 --- a/app/views/contacts/update.js.haml +++ b/app/views/contacts/update.js.haml @@ -8,6 +8,7 @@ crm.flip_form('edit_#{entity_name}'); crm.set_title('edit_#{entity_name}', '#{h @entity.full_name}'); = refresh_sidebar(:show) + $('#summary').html('#{ j (render partial: "#{entity_name.pluralize}/sidebar_show", entity_name => @entity) }'); - else $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }'); $('##{id}').effect("highlight", { duration:1500 }); diff --git a/app/views/leads/update.js.haml b/app/views/leads/update.js.haml index 947c70061..237f46b85 100755 --- a/app/views/leads/update.js.haml +++ b/app/views/leads/update.js.haml @@ -7,6 +7,7 @@ crm.flip_form('edit_#{entity_name}'); crm.set_title('edit_#{entity_name}', '#{h @entity.full_name}'); = refresh_sidebar(:show) + $('#summary').html('#{ j (render partial: "#{entity_name.pluralize}/sidebar_show", entity_name => @entity) }'); - else $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }'); $('##{id}').effect("highlight", { duration:1500 }); diff --git a/app/views/opportunities/update.js.haml b/app/views/opportunities/update.js.haml index c990d7620..268dcfa3e 100755 --- a/app/views/opportunities/update.js.haml +++ b/app/views/opportunities/update.js.haml @@ -7,6 +7,7 @@ crm.flip_form('edit_#{entity_name}'); crm.set_title('edit_#{entity_name}', '#{h @entity.name}'); = refresh_sidebar(:show) + $('#summary').html('#{ j (render partial: "#{entity_name.pluralize}/sidebar_show", entity_name => @entity) }'); - else $('##{id}').replaceWith('#{ j render(partial: entity_name, collection: [ @entity ]) }'); $('##{id}').effect("highlight", { duration:1500 }); From 7f2ded9675999ceb0b568af9bee0fa422a2aba1e Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Fri, 23 Feb 2024 15:18:45 +0800 Subject: [PATCH 019/117] Fixed missing select2 box on address country input. --- app/assets/javascripts/crm_select2.js.coffee | 5 ++++- app/views/shared/_address.html.haml | 2 +- config/settings.default.yml | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/crm_select2.js.coffee b/app/assets/javascripts/crm_select2.js.coffee index 7f108accf..17075f982 100644 --- a/app/assets/javascripts/crm_select2.js.coffee +++ b/app/assets/javascripts/crm_select2.js.coffee @@ -15,6 +15,7 @@ $(this).select2 'width':'resolve' placeholder: $(this).attr("placeholder") + allowClear: true ajax: url: $(this).data("url") dataType: 'json' @@ -22,16 +23,18 @@ $(this).select2 'width':'resolve' placeholder: $(this).attr("placeholder") + allowClear: true if $(this).prop("disabled") == true $(this).next('.select2-container').disable() - $(this).next('.select2-container').hide() + $(this).next('.select2-container').hide() $(".select2_tag").not(".select2-container, .select2-offscreen").each -> $(this).select2 'width':'resolve' placeholder: $(this).data("placeholder") multiple: $(this).data("multiple") + allowClear: true $(document).ready -> crm.make_select2() diff --git a/app/views/shared/_address.html.haml b/app/views/shared/_address.html.haml index 3493d30b2..02cbb52d3 100644 --- a/app/views/shared/_address.html.haml +++ b/app/views/shared/_address.html.haml @@ -41,4 +41,4 @@ = address_field(a, :zipcode, "width:80px;") %td= spacer %td - = a.country_select(:country, priority_countries: priority_countries, include_blank: "", :"data-placeholder" => t(:select_a_country), style: "width:150px; margin-top:6px", class: 'select2') + = a.country_select(:country, {priority_countries: priority_countries, include_blank: true}, {data: { placeholder: t(:select_a_country)}, class: 'select2'}) \ No newline at end of file diff --git a/config/settings.default.yml b/config/settings.default.yml index 062e87c8f..00b2195cf 100644 --- a/config/settings.default.yml +++ b/config/settings.default.yml @@ -192,7 +192,8 @@ #------------------------------------------------------------------------------ # Specify which countries (if any) should appear at the top of country pickers # priority_countries: -# - Burkina Faso +# - AU +# - BF # Main and Admin Tabs #------------------------------------------------------------------------------ From 1ef260ba2d5e3d01610636a4b1bef5cc7a00b286 Mon Sep 17 00:00:00 2001 From: Steve Kenworthy Date: Sat, 24 Feb 2024 09:45:21 +0800 Subject: [PATCH 020/117] Handle edge case where application is unable to run tasks/migrations (#1191) * Handle edge case where application is unable to run tasks/migrations if a previous migration has errored. * Initializer checks that custom field table exists before running. * Update config/initializers/custom_field_ransack_translations.rb --------- Co-authored-by: Daniel O'Connor --- config/initializers/custom_field_ransack_translations.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/custom_field_ransack_translations.rb b/config/initializers/custom_field_ransack_translations.rb index dfb95aa5b..da9f1126e 100644 --- a/config/initializers/custom_field_ransack_translations.rb +++ b/config/initializers/custom_field_ransack_translations.rb @@ -7,7 +7,7 @@ #------------------------------------------------------------------------------ # Load field names for custom fields, for Ransack search require './app/models/setting' -if Setting.database_and_table_exists? +if Setting.database_and_table_exists? && ActiveRecord::Base.connection.table_exists?(:custom_fields) Rails.application.config.after_initialize do I18n.backend.load_translations From ddc3efc4dce8c8abf3703e37b7d5cf2d3047ee39 Mon Sep 17 00:00:00 2001 From: Steve Kenworthy Date: Sat, 24 Feb 2024 09:46:11 +0800 Subject: [PATCH 021/117] Fix load paths - this works for both Application and Engine mode. (#1240) Co-authored-by: Daniel O'Connor --- config/initializers/action_mailer.rb | 2 +- config/initializers/custom_field_ransack_translations.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/initializers/action_mailer.rb b/config/initializers/action_mailer.rb index f049d9c03..18a6459bc 100644 --- a/config/initializers/action_mailer.rb +++ b/config/initializers/action_mailer.rb @@ -10,7 +10,7 @@ # ActionMailer is setup in test mode later on # unless Rails.env.test? - require './app/models/setting' + require 'setting' smtp_settings = Setting.smtp || {} diff --git a/config/initializers/custom_field_ransack_translations.rb b/config/initializers/custom_field_ransack_translations.rb index da9f1126e..679dafcfa 100644 --- a/config/initializers/custom_field_ransack_translations.rb +++ b/config/initializers/custom_field_ransack_translations.rb @@ -6,7 +6,7 @@ # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php #------------------------------------------------------------------------------ # Load field names for custom fields, for Ransack search -require './app/models/setting' +require 'setting' if Setting.database_and_table_exists? && ActiveRecord::Base.connection.table_exists?(:custom_fields) Rails.application.config.after_initialize do I18n.backend.load_translations From 12f99df6821789fd02d7d66a743178ccd2468448 Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Sat, 24 Feb 2024 10:42:50 +0800 Subject: [PATCH 022/117] Pass html as an argument to formats rather than infer in the template name. --- app/views/accounts/show.js.haml | 2 +- app/views/campaigns/show.js.haml | 2 +- app/views/contacts/show.js.haml | 3 +-- app/views/leads/show.js.haml | 2 +- app/views/opportunities/show.js.haml | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/views/accounts/show.js.haml b/app/views/accounts/show.js.haml index 6e297a95d..b1eca453e 100644 --- a/app/views/accounts/show.js.haml +++ b/app/views/accounts/show.js.haml @@ -1,5 +1,5 @@ - entity_name = controller.controller_name.singularize.underscore #account - @entity = instance_variable_get("@#{entity_name}") -$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show.html", entity_name => @entity) }'); +$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show", formats: [:html], entity_name => @entity) }'); = raw generate_js_for_popups(@entity, :tasks, :contacts, :opportunities) diff --git a/app/views/campaigns/show.js.haml b/app/views/campaigns/show.js.haml index 84554b7ad..f2decd159 100755 --- a/app/views/campaigns/show.js.haml +++ b/app/views/campaigns/show.js.haml @@ -1,5 +1,5 @@ - entity_name = controller.controller_name.singularize.underscore #account - @entity = instance_variable_get("@#{entity_name}") -$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show.html", entity_name => @entity) }'); +$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show", formats: [:html], entity_name => @entity) }'); = raw generate_js_for_popups(@entity, :tasks, :leads, :opportunities) diff --git a/app/views/contacts/show.js.haml b/app/views/contacts/show.js.haml index a5d775e82..d03d1c151 100644 --- a/app/views/contacts/show.js.haml +++ b/app/views/contacts/show.js.haml @@ -1,5 +1,4 @@ - entity_name = controller.controller_name.singularize.underscore - @entity = instance_variable_get("@#{entity_name}") - -$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show.html", entity_name => @entity) }'); +$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show", formats: [:html], entity_name => @entity) }'); = raw generate_js_for_popups(@entity, :tasks, :opportunities) diff --git a/app/views/leads/show.js.haml b/app/views/leads/show.js.haml index 6fc37bab2..5d7f360a2 100755 --- a/app/views/leads/show.js.haml +++ b/app/views/leads/show.js.haml @@ -1,5 +1,5 @@ - entity_name = controller.controller_name.singularize.underscore #account - @entity = instance_variable_get("@#{entity_name}") -$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show.html", entity_name => @entity) }'); +$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show", formats: [:html], entity_name => @entity) }'); = raw generate_js_for_popups(@entity, :tasks) diff --git a/app/views/opportunities/show.js.haml b/app/views/opportunities/show.js.haml index fcc30a782..85d0de79c 100644 --- a/app/views/opportunities/show.js.haml +++ b/app/views/opportunities/show.js.haml @@ -1,5 +1,5 @@ - entity_name = controller.controller_name.singularize.underscore #account - @entity = instance_variable_get("@#{entity_name}") -$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show.html", entity_name => @entity) }'); +$('#main').html('#{ j (render template: "#{entity_name.pluralize}/show", formats: [:html], entity_name => @entity) }'); = raw generate_js_for_popups(@entity, :tasks, :contacts) From f36f585c092b418ee9fd18f601f18c1ef52048b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Feb 2024 07:53:06 +0000 Subject: [PATCH 023/117] Bump thor from 1.3.0 to 1.3.1 Bumps [thor](https://github.com/rails/thor) from 1.3.0 to 1.3.1. - [Release notes](https://github.com/rails/thor/releases) - [Commits](https://github.com/rails/thor/compare/v1.3.0...v1.3.1) --- updated-dependencies: - dependency-name: thor dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3ad6080ec..2103c092d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -445,7 +445,7 @@ GEM net-scp (>= 1.1.2) net-ssh (>= 2.8.0) temple (0.10.3) - thor (1.3.0) + thor (1.3.1) tilt (2.3.0) timecop (0.9.8) timeout (0.4.1) From af5375e28ef8b6de5d765f53e3e4b687c33d2146 Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Wed, 28 Feb 2024 21:16:39 +0800 Subject: [PATCH 024/117] Fix validation issues --- app/assets/stylesheets/rails.scss | 2 +- app/models/fields/field.rb | 2 +- app/views/accounts/_contact_info.html.haml | 2 +- app/views/accounts/_top_section.html.haml | 2 +- app/views/campaigns/_top_section.html.haml | 2 +- app/views/contacts/_top_section.html.haml | 6 +++--- app/views/fields/_group.html.haml | 7 +++++-- app/views/fields/_group_table.html.haml | 4 ++-- app/views/leads/_top_section.html.haml | 4 ++-- app/views/opportunities/_top_section.html.haml | 2 +- app/views/shared/_add_comment.html.haml | 2 +- 11 files changed, 19 insertions(+), 16 deletions(-) diff --git a/app/assets/stylesheets/rails.scss b/app/assets/stylesheets/rails.scss index 31163a9a5..657c2e47d 100644 --- a/app/assets/stylesheets/rails.scss +++ b/app/assets/stylesheets/rails.scss @@ -28,7 +28,7 @@ padding: 0px; } } } .fieldWithErrors { - input { + input, select { border: { bottom: 1px solid lightpink; right: 1px solid lightpink; }; diff --git a/app/models/fields/field.rb b/app/models/fields/field.rb index 149ca89aa..179caebcc 100644 --- a/app/models/fields/field.rb +++ b/app/models/fields/field.rb @@ -74,7 +74,7 @@ def column_type(field_type = as) def input_options input_html = {} attributes.reject do |k, v| - !%w[as collection disabled label placeholder required minlength maxlength].include?(k) || v.blank? + !%w[as collection disabled label placeholder minlength maxlength].include?(k) || v.blank? end.symbolize_keys.merge(input_html) end diff --git a/app/views/accounts/_contact_info.html.haml b/app/views/accounts/_contact_info.html.haml index 8d908c5e0..a6a9a50b6 100644 --- a/app/views/accounts/_contact_info.html.haml +++ b/app/views/accounts/_contact_info.html.haml @@ -1,5 +1,5 @@ - edit ||= false -- collapsed = (@account.errors.empty? && session[:account_contact].nil?) +- collapsed = session[:account_contact].nil? = subtitle :account_contact, collapsed, t(:contact_info) .section %small#account_contact_intro{ hidden_if(!collapsed) } diff --git a/app/views/accounts/_top_section.html.haml b/app/views/accounts/_top_section.html.haml index 84557b6f0..45e2413ed 100755 --- a/app/views/accounts/_top_section.html.haml +++ b/app/views/accounts/_top_section.html.haml @@ -2,7 +2,7 @@ .section %table %tr - %td(colspan="5") + %td{class: (@account.errors['name'].present? ? 'fieldWithErrors' : nil)}(colspan="5") .label.top.req #{t :name}: = f.text_field :name, autofocus: true, style: "width:500px" %tr diff --git a/app/views/campaigns/_top_section.html.haml b/app/views/campaigns/_top_section.html.haml index cd03ed22f..25e0aa65f 100755 --- a/app/views/campaigns/_top_section.html.haml +++ b/app/views/campaigns/_top_section.html.haml @@ -2,7 +2,7 @@ .section %table %tr - %td(colspan="5") + %td{class: (@campaign.errors['name'].present? ? 'fieldWithErrors' : nil)}(colspan="5") .label.top.req #{t :name}: = f.text_field :name, autofocus: true, style: "width:500px" %tr diff --git a/app/views/contacts/_top_section.html.haml b/app/views/contacts/_top_section.html.haml index f8fb1c5ca..21e690b41 100755 --- a/app/views/contacts/_top_section.html.haml +++ b/app/views/contacts/_top_section.html.haml @@ -3,11 +3,11 @@ .section %table %tr - %td - .label.top.req{ class: "#{Setting.require_first_names ? 'req' : nil}" } #{t :first_name}: + %td{class: (@contact.errors['first_name'].present? ? 'fieldWithErrors' : nil)} + .label.top{ class: "#{Setting.require_first_names ? 'req' : nil}" } #{t :first_name}: = f.text_field :first_name, autofocus: true %td= spacer - %td + %td{class: (@contact.errors['last_name'].present? ? 'fieldWithErrors' : nil)} .label.top{ class: "#{Setting.require_last_names ? 'req' : nil}" } #{t :last_name}: = f.text_field :last_name %tr diff --git a/app/views/fields/_group.html.haml b/app/views/fields/_group.html.haml index f7dbe435f..4b7d9ab3d 100644 --- a/app/views/fields/_group.html.haml +++ b/app/views/fields/_group.html.haml @@ -1,6 +1,9 @@ - if field_group.name != 'custom_fields' - -# start a new section - - collapsed = session[field_group.key].nil? + - # Ensure field groups containing validation errors are expanded + - required_field_names = field_group.fields.select(&:required?).map(&:name) + - fields_with_errors = @entity.errors.map{|e| e.attribute.to_s} + - force_open = (required_field_names & fields_with_errors).any? + - collapsed = session[field_group.key].nil? && !force_open %div{ id: "#{field_group.key}_container", :"data-tag" => field_group.tag.try(:name) } = subtitle field_group.key, collapsed, t(field_group.name, default: field_group.label) .section diff --git a/app/views/fields/_group_table.html.haml b/app/views/fields/_group_table.html.haml index a70350db8..0cf610a71 100644 --- a/app/views/fields/_group_table.html.haml +++ b/app/views/fields/_group_table.html.haml @@ -2,13 +2,13 @@ - field_group.fields.without_pairs.in_groups_of(2, false) do |group| %tr - group.each_with_index do |field, i| - %td + %td{class: (@entity.errors[field.name].present? ? 'fieldWithErrors' : nil)} - if field.hint.present? = image_tag "info_tiny.png", title: field.hint, class: "tooltip-icon" - if field.as == 'check_boxes' - value = f.object.send(field.name) - checked = YAML.load(value.to_s) - .label.top + .label.top{class: (field.required? ? 'req': nil)} = "#{field.label}:" = f.input_field field.name, field.input_options.merge(checked: checked) - if i == 0 diff --git a/app/views/leads/_top_section.html.haml b/app/views/leads/_top_section.html.haml index f5f9aea0f..e38c93550 100755 --- a/app/views/leads/_top_section.html.haml +++ b/app/views/leads/_top_section.html.haml @@ -3,11 +3,11 @@ .section %table %tr - %td + %td{ class: (@lead.errors['first_name'].present? ? 'fieldWithErrors' : nil)} .label.top{ class: "#{Setting.require_first_names ? 'req' : nil}" } #{t :first_name}: = f.text_field :first_name, autofocus: true %td= spacer - %td + %td{ class: (@lead.errors['last_name'].present? ? 'fieldWithErrors' : nil)} .label.top{ class: "#{Setting.require_last_names ? 'req' : nil}" } #{t :last_name}: = f.text_field :last_name %tr diff --git a/app/views/opportunities/_top_section.html.haml b/app/views/opportunities/_top_section.html.haml index 5d75aae9c..564e74c4a 100755 --- a/app/views/opportunities/_top_section.html.haml +++ b/app/views/opportunities/_top_section.html.haml @@ -2,7 +2,7 @@ .section %table %tr - %td + %td{class: (@opportunity.errors['name'].present? ? 'fieldWithErrors' : nil)} .label.req.top #{t :name}: = f.text_field :name, autofocus: true, style: "width:325px" %td= spacer diff --git a/app/views/shared/_add_comment.html.haml b/app/views/shared/_add_comment.html.haml index dc58723de..2b7d89169 100644 --- a/app/views/shared/_add_comment.html.haml +++ b/app/views/shared/_add_comment.html.haml @@ -1,5 +1,5 @@ - edit ||= false -- collapsed = @comment_body.nil? && f.object.errors.empty? +- collapsed = session[:comment].nil? = subtitle :comment, collapsed, t(:comment) .section %small#comment_intro{ hidden_if(!collapsed) } From 5c924164c7223d483399038e3e157c98892df5dc Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Wed, 28 Feb 2024 21:47:29 +0800 Subject: [PATCH 025/117] @entity is not always available. Use f.object instead --- app/views/fields/_group.html.haml | 2 +- app/views/fields/_group_table.html.haml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/fields/_group.html.haml b/app/views/fields/_group.html.haml index 4b7d9ab3d..8e83e06f6 100644 --- a/app/views/fields/_group.html.haml +++ b/app/views/fields/_group.html.haml @@ -1,7 +1,7 @@ - if field_group.name != 'custom_fields' - # Ensure field groups containing validation errors are expanded - required_field_names = field_group.fields.select(&:required?).map(&:name) - - fields_with_errors = @entity.errors.map{|e| e.attribute.to_s} + - fields_with_errors = f.object.errors.map{|e| e.attribute.to_s} - force_open = (required_field_names & fields_with_errors).any? - collapsed = session[field_group.key].nil? && !force_open %div{ id: "#{field_group.key}_container", :"data-tag" => field_group.tag.try(:name) } diff --git a/app/views/fields/_group_table.html.haml b/app/views/fields/_group_table.html.haml index 0cf610a71..4c103e88d 100644 --- a/app/views/fields/_group_table.html.haml +++ b/app/views/fields/_group_table.html.haml @@ -2,7 +2,7 @@ - field_group.fields.without_pairs.in_groups_of(2, false) do |group| %tr - group.each_with_index do |field, i| - %td{class: (@entity.errors[field.name].present? ? 'fieldWithErrors' : nil)} + %td{class: (f.object.errors[field.name].present? ? 'fieldWithErrors' : nil)} - if field.hint.present? = image_tag "info_tiny.png", title: field.hint, class: "tooltip-icon" - if field.as == 'check_boxes' From efa75214f69d214a8d4e116d22867995e420f3e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Feb 2024 01:38:16 +0000 Subject: [PATCH 026/117] Bump rack from 2.2.8 to 2.2.8.1 Bumps [rack](https://github.com/rack/rack) from 2.2.8 to 2.2.8.1. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.8...v2.2.8.1) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2103c092d..5a2171a39 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -294,7 +294,7 @@ GEM puma (6.4.2) nio4r (~> 2.0) racc (1.7.3) - rack (2.2.8) + rack (2.2.8.1) rack-test (2.1.0) rack (>= 1.3) rails (7.0.8) From 42f186381830361a28e2e810bb6caca1ca485e71 Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Thu, 29 Feb 2024 18:26:36 +0800 Subject: [PATCH 027/117] Re-add and extend html5 form validation to all required fields. When submitting a form, show invalid fields that are in hidden sections in order to facilitate corrections. --- app/assets/javascripts/application.js.erb | 1 + app/assets/javascripts/crm_validations.js.coffee | 12 ++++++++++++ app/models/fields/field.rb | 2 +- app/views/accounts/_top_section.html.haml | 2 +- app/views/campaigns/_top_section.html.haml | 2 +- app/views/contacts/_top_section.html.haml | 4 ++-- app/views/leads/_top_section.html.haml | 4 ++-- app/views/opportunities/_top_section.html.haml | 2 +- app/views/tasks/_top_section.html.haml | 8 ++++---- 9 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 app/assets/javascripts/crm_validations.js.coffee diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb index 7b76362be..98a370e26 100644 --- a/app/assets/javascripts/application.js.erb +++ b/app/assets/javascripts/application.js.erb @@ -17,6 +17,7 @@ //= require crm_loginout //= require crm_tags //= require crm_sortable +//= require crm_validations //= require textarea_autocomplete //= require crm_textarea_autocomplete //= require crm_select2 diff --git a/app/assets/javascripts/crm_validations.js.coffee b/app/assets/javascripts/crm_validations.js.coffee new file mode 100644 index 000000000..9836b5a2e --- /dev/null +++ b/app/assets/javascripts/crm_validations.js.coffee @@ -0,0 +1,12 @@ +#------------------------------------------------------------------------------ +(($) -> + + # Ensure that any html5 required fields are unhidden when invalid + #---------------------------------------------------------------------------- + $(document).on 'click', 'form.simple_form input:submit', (event) -> + form = this.closest('form') + invalidInputs = form.querySelectorAll(':invalid') + $(invalidInputs).each -> + $(this).closest('.field_group').show() + +) jQuery \ No newline at end of file diff --git a/app/models/fields/field.rb b/app/models/fields/field.rb index 179caebcc..149ca89aa 100644 --- a/app/models/fields/field.rb +++ b/app/models/fields/field.rb @@ -74,7 +74,7 @@ def column_type(field_type = as) def input_options input_html = {} attributes.reject do |k, v| - !%w[as collection disabled label placeholder minlength maxlength].include?(k) || v.blank? + !%w[as collection disabled label placeholder required minlength maxlength].include?(k) || v.blank? end.symbolize_keys.merge(input_html) end diff --git a/app/views/accounts/_top_section.html.haml b/app/views/accounts/_top_section.html.haml index 45e2413ed..50fae5801 100755 --- a/app/views/accounts/_top_section.html.haml +++ b/app/views/accounts/_top_section.html.haml @@ -4,7 +4,7 @@ %tr %td{class: (@account.errors['name'].present? ? 'fieldWithErrors' : nil)}(colspan="5") .label.top.req #{t :name}: - = f.text_field :name, autofocus: true, style: "width:500px" + = f.text_field :name, autofocus: true, style: "width:500px", required: "required" %tr %td .label #{t :assigned_to}: diff --git a/app/views/campaigns/_top_section.html.haml b/app/views/campaigns/_top_section.html.haml index 25e0aa65f..5174d16c2 100755 --- a/app/views/campaigns/_top_section.html.haml +++ b/app/views/campaigns/_top_section.html.haml @@ -4,7 +4,7 @@ %tr %td{class: (@campaign.errors['name'].present? ? 'fieldWithErrors' : nil)}(colspan="5") .label.top.req #{t :name}: - = f.text_field :name, autofocus: true, style: "width:500px" + = f.text_field :name, autofocus: true, style: "width:500px", required: "required" %tr %td .label #{t :start_date}: diff --git a/app/views/contacts/_top_section.html.haml b/app/views/contacts/_top_section.html.haml index 21e690b41..ca67c331a 100755 --- a/app/views/contacts/_top_section.html.haml +++ b/app/views/contacts/_top_section.html.haml @@ -5,11 +5,11 @@ %tr %td{class: (@contact.errors['first_name'].present? ? 'fieldWithErrors' : nil)} .label.top{ class: "#{Setting.require_first_names ? 'req' : nil}" } #{t :first_name}: - = f.text_field :first_name, autofocus: true + = f.text_field :first_name, autofocus: true, required: (Setting.require_first_names ? "required" : nil) %td= spacer %td{class: (@contact.errors['last_name'].present? ? 'fieldWithErrors' : nil)} .label.top{ class: "#{Setting.require_last_names ? 'req' : nil}" } #{t :last_name}: - = f.text_field :last_name + = f.text_field :last_name, required: (Setting.require_last_names ? "required" : nil) %tr %td .label #{t :email}: diff --git a/app/views/leads/_top_section.html.haml b/app/views/leads/_top_section.html.haml index e38c93550..606b10849 100755 --- a/app/views/leads/_top_section.html.haml +++ b/app/views/leads/_top_section.html.haml @@ -5,11 +5,11 @@ %tr %td{ class: (@lead.errors['first_name'].present? ? 'fieldWithErrors' : nil)} .label.top{ class: "#{Setting.require_first_names ? 'req' : nil}" } #{t :first_name}: - = f.text_field :first_name, autofocus: true + = f.text_field :first_name, autofocus: true, required: (Setting.require_first_names ? "required" : nil) %td= spacer %td{ class: (@lead.errors['last_name'].present? ? 'fieldWithErrors' : nil)} .label.top{ class: "#{Setting.require_last_names ? 'req' : nil}" } #{t :last_name}: - = f.text_field :last_name + = f.text_field :last_name, required: (Setting.require_last_names ? "required" : nil) %tr %td .label #{t :email}: diff --git a/app/views/opportunities/_top_section.html.haml b/app/views/opportunities/_top_section.html.haml index 564e74c4a..67b928127 100755 --- a/app/views/opportunities/_top_section.html.haml +++ b/app/views/opportunities/_top_section.html.haml @@ -4,7 +4,7 @@ %tr %td{class: (@opportunity.errors['name'].present? ? 'fieldWithErrors' : nil)} .label.req.top #{t :name}: - = f.text_field :name, autofocus: true, style: "width:325px" + = f.text_field :name, autofocus: true, style: "width:325px", required: "required" %td= spacer %td .label.req.top #{t :stage}: diff --git a/app/views/tasks/_top_section.html.haml b/app/views/tasks/_top_section.html.haml index dbab11393..129fb5595 100755 --- a/app/views/tasks/_top_section.html.haml +++ b/app/views/tasks/_top_section.html.haml @@ -3,10 +3,10 @@ %tr %td(colspan="5") .label.top.req #{t :name}: - = f.text_field :name, autofocus: true, style: "width:500px" + = f.text_field :name, autofocus: true, style: "width:500px", required: "required" %tr %td - .label.req #{t :due}: + .label #{t :due}: - bucket = (params[:bucket].blank? ? @task.bucket : params[:bucket]) || "due_asap" - with_time = Setting.task_calendar_with_time - if @task.bucket != "specific_time" @@ -18,11 +18,11 @@ = f.text_field :calendar, value: f.object.due_at.strftime(fmt), style: "width:160px;", autocomplete: :off, class: (with_time ? 'datetime' : 'date') %td= spacer %td - .label.req #{t :assign_to}: + .label #{t :assign_to}: = user_select(:task, all_users, current_user) %td= spacer %td - .label.req #{t :category}: + .label #{t :category}: = f.select :category, @category, { selected: @task.category.blank? ? nil : @task.category.to_sym, include_blank: t(:select_blank) }, { style: "width:160px", class: 'select2' } - if Setting.background_info && Setting.background_info.include?(:task) From 988ba85ff443badc87c05ef44d026b4b6067eb94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 1 Mar 2024 07:44:21 +0000 Subject: [PATCH 028/117] Bump rubocop from 1.60.2 to 1.61.0 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.60.2 to 1.61.0. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.60.2...v1.61.0) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5a2171a39..a0b19148f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -285,6 +285,7 @@ GEM addressable css_parser (>= 1.12.0) htmlentities (>= 4.0.0) + prism (0.24.0) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) @@ -393,7 +394,7 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.1) - rubocop (1.60.2) + rubocop (1.61.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -404,8 +405,9 @@ GEM rubocop-ast (>= 1.30.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.30.0) - parser (>= 3.2.1.0) + rubocop-ast (1.31.0) + parser (>= 3.3.0.4) + prism (>= 0.24.0) ruby-progressbar (1.13.0) ruby-vips (2.2.0) ffi (~> 1.12) From 687aab287348462c27264ac6046e061ca58a55ea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 07:08:02 +0000 Subject: [PATCH 029/117] Bump pg from 1.5.5 to 1.5.6 Bumps [pg](https://github.com/ged/ruby-pg) from 1.5.5 to 1.5.6. - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.md) - [Commits](https://github.com/ged/ruby-pg/compare/v1.5.5...v1.5.6) --- updated-dependencies: - dependency-name: pg dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a0b19148f..f10e7296a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -279,7 +279,7 @@ GEM parser (3.3.0.5) ast (~> 2.4.1) racc - pg (1.5.5) + pg (1.5.6) popper_js (2.11.8) premailer (1.22.0) addressable From 9a7227c98dc6a70e1019f5c5f0d0411f03a886bf Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Tue, 5 Mar 2024 21:39:54 +0800 Subject: [PATCH 030/117] Fix changes in select2 since v3 -> v4 a while ago --- app/assets/javascripts/crm.js.coffee | 5 ++++- app/assets/javascripts/crm_tags.js.coffee | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/crm.js.coffee b/app/assets/javascripts/crm.js.coffee index d095c8d3c..c5f89e091 100644 --- a/app/assets/javascripts/crm.js.coffee +++ b/app/assets/javascripts/crm.js.coffee @@ -336,7 +336,10 @@ # Country dropdown needs special treatment ;-) country = $("#" + from + "_attributes_country").select2("data") - $("#" + to + "_attributes_country").select2("data", country, true) + if country.length == 1 + country_dropdown = $("#" + to + "_attributes_country") + country_dropdown.val(country[0].id) + country_dropdown.trigger('change') #---------------------------------------------------------------------------- diff --git a/app/assets/javascripts/crm_tags.js.coffee b/app/assets/javascripts/crm_tags.js.coffee index ad1758959..a959b0e35 100644 --- a/app/assets/javascripts/crm_tags.js.coffee +++ b/app/assets/javascripts/crm_tags.js.coffee @@ -7,16 +7,16 @@ # The multiselect tag list has listeners to load/remove fieldsets related to tags #---------------------------------------------------------------------------- - $(document).on 'select2-selecting', "[name*='tag_list']", (event) -> + $(document).on 'select2:select', "[name*='tag_list']", (event) -> url = $(this).data('url') asset_id = $(this).data('asset-id') $.get(url, { - tag: event.val + tag: event.params.data.text asset_id: asset_id collapsed: "no" }) - $(document).on 'select2-removing', "[name*='tag_list']", (event) -> - $("#field_groups div[data-tag='" + event.val + "']").remove() + $(document).on 'select2:unselect', "[name*='tag_list']", (event) -> + $("#field_groups div[data-tag='" + event.params.data.text + "']").remove() ) jQuery From 2ec9d4d4de99cc28682170a74bb1a57412f2eff0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Mar 2024 07:46:30 +0000 Subject: [PATCH 031/117] Bump premailer from 1.22.0 to 1.23.0 Bumps [premailer](https://github.com/premailer/premailer) from 1.22.0 to 1.23.0. - [Changelog](https://github.com/premailer/premailer/blob/master/CHANGELOG.md) - [Commits](https://github.com/premailer/premailer/compare/v1.22.0...v1.23.0) --- updated-dependencies: - dependency-name: premailer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f10e7296a..9bafcae7a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -281,7 +281,7 @@ GEM racc pg (1.5.6) popper_js (2.11.8) - premailer (1.22.0) + premailer (1.23.0) addressable css_parser (>= 1.12.0) htmlentities (>= 4.0.0) From 0d42ec4c51531a267c752adf42a5417872b554c7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Mar 2024 07:28:41 +0000 Subject: [PATCH 032/117] Bump rubocop from 1.61.0 to 1.62.0 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.61.0 to 1.62.0. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.61.0...v1.62.0) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9bafcae7a..32fb99ae3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -285,7 +285,6 @@ GEM addressable css_parser (>= 1.12.0) htmlentities (>= 4.0.0) - prism (0.24.0) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) @@ -394,7 +393,7 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.1) - rubocop (1.61.0) + rubocop (1.62.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -402,12 +401,11 @@ GEM rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.30.0, < 2.0) + rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.0) + rubocop-ast (1.31.1) parser (>= 3.3.0.4) - prism (>= 0.24.0) ruby-progressbar (1.13.0) ruby-vips (2.2.0) ffi (~> 1.12) From ce2c45dfc4cb9f15a329c12b80659e012ce7b028 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Mar 2024 07:30:11 +0000 Subject: [PATCH 033/117] Bump capistrano from 3.18.0 to 3.18.1 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.18.0 to 3.18.1. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.18.0...v3.18.1) --- updated-dependencies: - dependency-name: capistrano dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 32fb99ae3..484446f53 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -100,7 +100,7 @@ GEM activerecord (>= 4.2) addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) - airbrussh (1.5.0) + airbrussh (1.5.1) sshkit (>= 1.6.1, != 1.7.0) ast (2.4.2) autoprefixer-rails (10.4.16.0) @@ -117,7 +117,7 @@ GEM builder (3.2.4) byebug (11.1.3) cancancan (3.5.0) - capistrano (3.18.0) + capistrano (3.18.1) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) @@ -215,7 +215,7 @@ GEM tilt headless (2.3.1) htmlentities (4.3.4) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) @@ -250,6 +250,7 @@ GEM libv8-node (~> 18.16.0.0) minitest (5.21.2) msgpack (1.7.2) + mutex_m (0.2.0) nenv (0.3.0) net-imap (0.4.6) date @@ -260,9 +261,11 @@ GEM timeout net-scp (4.0.0) net-ssh (>= 2.6.5, < 8.0.0) + net-sftp (4.0.0) + net-ssh (>= 5.0.0, < 8.0.0) net-smtp (0.4.0) net-protocol - net-ssh (7.2.0) + net-ssh (7.2.1) nio4r (2.7.0) nokogiri (1.16.2-arm64-darwin) racc (~> 1.4) @@ -441,8 +444,10 @@ GEM sprockets (>= 3.0.0) sqlite3 (1.6.9-arm64-darwin) sqlite3 (1.6.9-x86_64-linux) - sshkit (1.21.6) + sshkit (1.22.0) + mutex_m net-scp (>= 1.1.2) + net-sftp (>= 2.1.2) net-ssh (>= 2.8.0) temple (0.10.3) thor (1.3.1) From b38d08066d56f1956eef02f91a43584b45d98aa8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 07:41:44 +0000 Subject: [PATCH 034/117] Bump rubocop from 1.62.0 to 1.62.1 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.62.0 to 1.62.1. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.62.0...v1.62.1) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 32fb99ae3..46eea81e1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -393,7 +393,7 @@ GEM rspec-mocks (~> 3.12) rspec-support (~> 3.12) rspec-support (3.12.1) - rubocop (1.62.0) + rubocop (1.62.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -404,7 +404,7 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.1) + rubocop-ast (1.31.2) parser (>= 3.3.0.4) ruby-progressbar (1.13.0) ruby-vips (2.2.0) From 5ce8bdf3e4d4eb8d7e13616a0046d9d17314a59e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Mar 2024 07:17:20 +0000 Subject: [PATCH 035/117] Bump rails-i18n from 7.0.8 to 7.0.9 Bumps [rails-i18n](https://github.com/svenfuchs/rails-i18n) from 7.0.8 to 7.0.9. - [Changelog](https://github.com/svenfuchs/rails-i18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/svenfuchs/rails-i18n/compare/v7.0.8...v7.0.9) --- updated-dependencies: - dependency-name: rails-i18n dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 46eea81e1..8894ba585 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -215,7 +215,7 @@ GEM tilt headless (2.3.1) htmlentities (4.3.4) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) @@ -248,7 +248,7 @@ GEM mini_mime (1.1.5) mini_racer (0.8.0) libv8-node (~> 18.16.0.0) - minitest (5.21.2) + minitest (5.22.2) msgpack (1.7.2) nenv (0.3.0) net-imap (0.4.6) @@ -322,7 +322,7 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - rails-i18n (7.0.8) + rails-i18n (7.0.9) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) rails-observers (0.1.5) @@ -469,7 +469,7 @@ GEM will_paginate (4.0.0) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.12) + zeitwerk (2.6.13) zeus (0.16.0) method_source (>= 0.6.7) From 8b746e1308a8f0950dacc542e37b4a43b1f5b1ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Mar 2024 07:28:10 +0000 Subject: [PATCH 036/117] Bump nokogiri from 1.16.2 to 1.16.3 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.16.2 to 1.16.3. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.16.2...v1.16.3) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8894ba585..8e62fb7b2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -264,9 +264,9 @@ GEM net-protocol net-ssh (7.2.0) nio4r (2.7.0) - nokogiri (1.16.2-arm64-darwin) + nokogiri (1.16.3-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.2-x86_64-linux) + nokogiri (1.16.3-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) From 1e488758a3a023794ae7f88a26b535e8dfd4868e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 07:19:16 +0000 Subject: [PATCH 037/117] Bump rspec-rails from 6.1.1 to 6.1.2 Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 6.1.1 to 6.1.2. - [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v6.1.1...v6.1.2) --- updated-dependencies: - dependency-name: rspec-rails dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8e62fb7b2..d7d1d51ca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -173,7 +173,7 @@ GEM devise (>= 2.1.0) devise-i18n (1.12.0) devise (>= 4.9.0) - diff-lcs (1.5.0) + diff-lcs (1.5.1) dynamic_form (1.3.1) actionview (> 5.2.0) activemodel (> 5.2.0) @@ -248,7 +248,7 @@ GEM mini_mime (1.1.5) mini_racer (0.8.0) libv8-node (~> 18.16.0.0) - minitest (5.22.2) + minitest (5.22.3) msgpack (1.7.2) nenv (0.3.0) net-imap (0.4.6) @@ -368,31 +368,31 @@ GEM actionpack (>= 5.2) railties (>= 5.2) rexml (3.2.6) - rspec (3.12.0) - rspec-core (~> 3.12.0) - rspec-expectations (~> 3.12.0) - rspec-mocks (~> 3.12.0) + rspec (3.13.0) + rspec-core (~> 3.13.0) + rspec-expectations (~> 3.13.0) + rspec-mocks (~> 3.13.0) rspec-activemodel-mocks (1.2.0) activemodel (>= 3.0) activesupport (>= 3.0) rspec-mocks (>= 2.99, < 4.0) - rspec-core (3.12.2) - rspec-support (~> 3.12.0) - rspec-expectations (3.12.3) + rspec-core (3.13.0) + rspec-support (~> 3.13.0) + rspec-expectations (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-mocks (3.12.6) + rspec-support (~> 3.13.0) + rspec-mocks (3.13.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.12.0) - rspec-rails (6.1.1) + rspec-support (~> 3.13.0) + rspec-rails (6.1.2) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) - rspec-core (~> 3.12) - rspec-expectations (~> 3.12) - rspec-mocks (~> 3.12) - rspec-support (~> 3.12) - rspec-support (3.12.1) + rspec-core (~> 3.13) + rspec-expectations (~> 3.13) + rspec-mocks (~> 3.13) + rspec-support (~> 3.13) + rspec-support (3.13.1) rubocop (1.62.1) json (~> 2.3) language_server-protocol (>= 3.17.0) From 46ccc880c113e05a826ca4365cfeb48f3a0c3bf8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 07:55:20 +0000 Subject: [PATCH 038/117] Bump mini_racer from 0.8.0 to 0.9.0 Bumps [mini_racer](https://github.com/discourse/mini_racer) from 0.8.0 to 0.9.0. - [Changelog](https://github.com/rubyjs/mini_racer/blob/main/CHANGELOG) - [Commits](https://github.com/discourse/mini_racer/compare/v0.8.0...v0.9.0) --- updated-dependencies: - dependency-name: mini_racer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d7d1d51ca..339594bae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -227,8 +227,8 @@ GEM thor (>= 0.14, < 2.0) json (2.7.1) language_server-protocol (3.17.0.3) - libv8-node (18.16.0.0-arm64-darwin) - libv8-node (18.16.0.0-x86_64-linux) + libv8-node (18.19.0.0-arm64-darwin) + libv8-node (18.19.0.0-x86_64-linux) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -246,8 +246,8 @@ GEM method_source (1.0.0) mini_magick (4.12.0) mini_mime (1.1.5) - mini_racer (0.8.0) - libv8-node (~> 18.16.0.0) + mini_racer (0.9.0) + libv8-node (~> 18.19.0.0) minitest (5.22.3) msgpack (1.7.2) nenv (0.3.0) From d3b5cb099e4a535ea5013fd0b6efcbb6ff13e9a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 07:35:24 +0000 Subject: [PATCH 039/117] Bump rubocop from 1.62.1 to 1.63.0 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.62.1 to 1.63.0. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.62.1...v1.63.0) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7f33ba048..6de837d7a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -225,7 +225,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (2.7.1) + json (2.7.2) language_server-protocol (3.17.0.3) libv8-node (18.19.0.0-arm64-darwin) libv8-node (18.19.0.0-x86_64-linux) @@ -396,7 +396,7 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.62.1) + rubocop (1.63.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) From 43c3035d20a9bbdbb3887b2f34c26defce2be785 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 07:32:09 +0000 Subject: [PATCH 040/117] Bump rubocop from 1.63.0 to 1.63.1 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.63.0 to 1.63.1. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.63.0...v1.63.1) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6de837d7a..a79cd99af 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -396,7 +396,7 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.63.0) + rubocop (1.63.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) From 25e3071bcf9d130dd09b0cb175732a7e21ce1ad5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 07:33:22 +0000 Subject: [PATCH 041/117] Bump nokogiri from 1.16.3 to 1.16.4 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.16.3 to 1.16.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.16.3...v1.16.4) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6de837d7a..5bec7d55e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -267,9 +267,9 @@ GEM net-protocol net-ssh (7.2.1) nio4r (2.7.0) - nokogiri (1.16.3-arm64-darwin) + nokogiri (1.16.4-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.3-x86_64-linux) + nokogiri (1.16.4-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) From 2562257d65b5638a93aba412e5f9c42867729cae Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 07:33:51 +0000 Subject: [PATCH 042/117] Bump devise from 4.9.3 to 4.9.4 Bumps [devise](https://github.com/heartcombo/devise) from 4.9.3 to 4.9.4. - [Release notes](https://github.com/heartcombo/devise/releases) - [Changelog](https://github.com/heartcombo/devise/blob/main/CHANGELOG.md) - [Commits](https://github.com/heartcombo/devise/compare/v4.9.3...v4.9.4) --- updated-dependencies: - dependency-name: devise dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6de837d7a..d30f66257 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -163,7 +163,7 @@ GEM database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) date (3.3.4) - devise (4.9.3) + devise (4.9.4) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) @@ -297,7 +297,7 @@ GEM puma (6.4.2) nio4r (~> 2.0) racc (1.7.3) - rack (2.2.8.1) + rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) rails (7.0.8) @@ -349,7 +349,7 @@ GEM thor (~> 1.0) zeitwerk (~> 2.5) rainbow (3.1.1) - rake (13.1.0) + rake (13.2.1) ransack (2.6.0) activerecord (>= 6.0.4) activesupport (>= 6.0.4) From 30a7ed2c62d6cf678396a715c05e36639e0b1771 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 07:28:13 +0000 Subject: [PATCH 043/117] Bump rubocop from 1.63.1 to 1.63.2 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.63.1 to 1.63.2. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.63.1...v1.63.2) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index af06c0d60..5977f16eb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -396,7 +396,7 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.63.1) + rubocop (1.63.2) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) From c837a10721ffdea0076def3dc1e8df9d6232446e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 07:43:39 +0000 Subject: [PATCH 044/117] Bump mini_racer from 0.9.0 to 0.12.0 Bumps [mini_racer](https://github.com/discourse/mini_racer) from 0.9.0 to 0.12.0. - [Changelog](https://github.com/rubyjs/mini_racer/blob/main/CHANGELOG) - [Commits](https://github.com/discourse/mini_racer/compare/v0.9.0...v0.12.0) --- updated-dependencies: - dependency-name: mini_racer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5977f16eb..bb290f672 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -227,8 +227,8 @@ GEM thor (>= 0.14, < 2.0) json (2.7.2) language_server-protocol (3.17.0.3) - libv8-node (18.19.0.0-arm64-darwin) - libv8-node (18.19.0.0-x86_64-linux) + libv8-node (21.7.2.0-arm64-darwin) + libv8-node (21.7.2.0-x86_64-linux) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -246,8 +246,8 @@ GEM method_source (1.0.0) mini_magick (4.12.0) mini_mime (1.1.5) - mini_racer (0.9.0) - libv8-node (~> 18.19.0.0) + mini_racer (0.12.0) + libv8-node (~> 21.7.2.0) minitest (5.22.3) msgpack (1.7.2) mutex_m (0.2.0) From 5a9e33bb89d7a3711b2eeee6076ce0e81a776400 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 07:44:28 +0000 Subject: [PATCH 045/117] Bump rubocop from 1.63.2 to 1.63.3 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.63.2 to 1.63.3. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.63.2...v1.63.3) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5977f16eb..16708891e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -396,7 +396,7 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.63.2) + rubocop (1.63.3) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) From 682f839aadfa196bbc235284a40caafcb2ae9387 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 07:32:57 +0000 Subject: [PATCH 046/117] Bump rubocop from 1.63.3 to 1.63.4 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.63.3 to 1.63.4. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.63.3...v1.63.4) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c84391a3f..1cc47fcfe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -279,7 +279,7 @@ GEM activerecord (>= 6.1) request_store (~> 1.4) parallel (1.24.0) - parser (3.3.0.5) + parser (3.3.1.0) ast (~> 2.4.1) racc pg (1.5.6) @@ -396,7 +396,7 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.63.3) + rubocop (1.63.4) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) From 88fd8c83531366636aeb6081ab792581d3d9e75c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 07:37:23 +0000 Subject: [PATCH 047/117] Bump rubocop from 1.63.4 to 1.63.5 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.63.4 to 1.63.5. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.63.4...v1.63.5) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1cc47fcfe..510aca41d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -396,7 +396,7 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.63.4) + rubocop (1.63.5) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -407,8 +407,8 @@ GEM rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.2) - parser (>= 3.3.0.4) + rubocop-ast (1.31.3) + parser (>= 3.3.1.0) ruby-progressbar (1.13.0) ruby-vips (2.2.0) ffi (~> 1.12) From f3d6b4fd05ca5b7cf8399c2c9b27e527bc2fd388 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 23:47:08 +0000 Subject: [PATCH 048/117] Bump nokogiri from 1.16.4 to 1.16.5 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.16.4 to 1.16.5. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.16.4...v1.16.5) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 510aca41d..c9e8d1543 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -267,9 +267,9 @@ GEM net-protocol net-ssh (7.2.1) nio4r (2.7.0) - nokogiri (1.16.4-arm64-darwin) + nokogiri (1.16.5-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.4-x86_64-linux) + nokogiri (1.16.5-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) From d7f51d938c0203d6bbc042e0a603fee2200b23cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 07:53:48 +0000 Subject: [PATCH 049/117] Bump rb-inotify from 0.10.1 to 0.11.1 Bumps [rb-inotify](https://github.com/guard/rb-inotify) from 0.10.1 to 0.11.1. - [Commits](https://github.com/guard/rb-inotify/compare/v0.10.1...v0.11.1) --- updated-dependencies: - dependency-name: rb-inotify dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c9e8d1543..e7a6c5522 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -362,7 +362,7 @@ GEM rb-fchange (0.0.6) ffi rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) regexp_parser (2.9.0) request_store (1.5.1) From 6a58d38afbeddb6f04440372974cd9db01a0a75f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 08:00:30 +0000 Subject: [PATCH 050/117] Bump cancancan from 3.5.0 to 3.6.0 Bumps [cancancan](https://github.com/CanCanCommunity/cancancan) from 3.5.0 to 3.6.0. - [Release notes](https://github.com/CanCanCommunity/cancancan/releases) - [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md) - [Commits](https://github.com/CanCanCommunity/cancancan/compare/3.5.0...3.6.0) --- updated-dependencies: - dependency-name: cancancan dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e7a6c5522..404593157 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -116,7 +116,7 @@ GEM racc builder (3.2.4) byebug (11.1.3) - cancancan (3.5.0) + cancancan (3.6.0) capistrano (3.18.1) airbrussh (>= 1.0.0) i18n From 0308494b32f547d0258b9b3fd921372472136ab8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 07:21:26 +0000 Subject: [PATCH 051/117] Bump simple_form from 5.3.0 to 5.3.1 Bumps [simple_form](https://github.com/heartcombo/simple_form) from 5.3.0 to 5.3.1. - [Release notes](https://github.com/heartcombo/simple_form/releases) - [Changelog](https://github.com/heartcombo/simple_form/blob/main/CHANGELOG.md) - [Commits](https://github.com/heartcombo/simple_form/compare/v5.3.0...v5.3.1) --- updated-dependencies: - dependency-name: simple_form dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 404593157..e2059f09e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -215,7 +215,7 @@ GEM tilt headless (2.3.1) htmlentities (4.3.4) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) @@ -248,7 +248,7 @@ GEM mini_mime (1.1.5) mini_racer (0.12.0) libv8-node (~> 21.7.2.0) - minitest (5.22.3) + minitest (5.23.1) msgpack (1.7.2) mutex_m (0.2.0) nenv (0.3.0) @@ -296,7 +296,7 @@ GEM public_suffix (5.0.4) puma (6.4.2) nio4r (~> 2.0) - racc (1.7.3) + racc (1.8.0) rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) @@ -432,7 +432,7 @@ GEM rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) shellany (0.0.1) - simple_form (5.3.0) + simple_form (5.3.1) actionpack (>= 5.2) activemodel (>= 5.2) sprockets (4.2.1) From c189c6de0773650d692c12bd9fc046d678679349 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 07:56:46 +0000 Subject: [PATCH 052/117] Bump devise-i18n from 1.12.0 to 1.12.1 Bumps [devise-i18n](https://github.com/tigrish/devise-i18n) from 1.12.0 to 1.12.1. - [Release notes](https://github.com/tigrish/devise-i18n/releases) - [Changelog](https://github.com/tigrish/devise-i18n/blob/master/CHANGELOG.md) - [Commits](https://github.com/tigrish/devise-i18n/compare/v1.12.0...v1.12.1) --- updated-dependencies: - dependency-name: devise-i18n dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 404593157..8ca1f700a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -171,7 +171,7 @@ GEM warden (~> 1.2.3) devise-encryptable (0.2.0) devise (>= 2.1.0) - devise-i18n (1.12.0) + devise-i18n (1.12.1) devise (>= 4.9.0) diff-lcs (1.5.1) dynamic_form (1.3.1) @@ -215,7 +215,7 @@ GEM tilt headless (2.3.1) htmlentities (4.3.4) - i18n (1.14.4) + i18n (1.14.5) concurrent-ruby (~> 1.0) image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) @@ -243,12 +243,12 @@ GEM net-smtp marcel (1.0.2) matrix (0.4.2) - method_source (1.0.0) + method_source (1.1.0) mini_magick (4.12.0) mini_mime (1.1.5) mini_racer (0.12.0) libv8-node (~> 21.7.2.0) - minitest (5.22.3) + minitest (5.23.1) msgpack (1.7.2) mutex_m (0.2.0) nenv (0.3.0) @@ -296,7 +296,7 @@ GEM public_suffix (5.0.4) puma (6.4.2) nio4r (~> 2.0) - racc (1.7.3) + racc (1.8.0) rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) @@ -474,7 +474,7 @@ GEM will_paginate (4.0.0) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.13) + zeitwerk (2.6.15) zeus (0.16.0) method_source (>= 0.6.7) From 8dcfadb5fb4991b16a07868a2e9bc9fd76caf762 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 07:59:16 +0000 Subject: [PATCH 053/117] Bump cancancan from 3.6.0 to 3.6.1 Bumps [cancancan](https://github.com/CanCanCommunity/cancancan) from 3.6.0 to 3.6.1. - [Release notes](https://github.com/CanCanCommunity/cancancan/releases) - [Changelog](https://github.com/CanCanCommunity/cancancan/blob/develop/CHANGELOG.md) - [Commits](https://github.com/CanCanCommunity/cancancan/commits) --- updated-dependencies: - dependency-name: cancancan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 404593157..3fd0a1c7c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -116,7 +116,7 @@ GEM racc builder (3.2.4) byebug (11.1.3) - cancancan (3.6.0) + cancancan (3.6.1) capistrano (3.18.1) airbrussh (>= 1.0.0) i18n From d9ca728446eba1e1108f6b7eecb50b68013dc9fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 07:02:27 +0000 Subject: [PATCH 054/117] Bump rubocop from 1.63.5 to 1.64.1 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.63.5 to 1.64.1. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.63.5...v1.64.1) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1e04d04d5..1b6e40f16 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -279,7 +279,7 @@ GEM activerecord (>= 6.1) request_store (~> 1.4) parallel (1.24.0) - parser (3.3.1.0) + parser (3.3.2.0) ast (~> 2.4.1) racc pg (1.5.6) @@ -364,13 +364,14 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - regexp_parser (2.9.0) + regexp_parser (2.9.2) request_store (1.5.1) rack (>= 1.4) responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.2.6) + rexml (3.2.8) + strscan (>= 3.0.9) rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -396,7 +397,7 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.63.5) + rubocop (1.64.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -449,6 +450,7 @@ GEM net-scp (>= 1.1.2) net-sftp (>= 2.1.2) net-ssh (>= 2.8.0) + strscan (3.1.0) temple (0.10.3) thor (1.3.1) tilt (2.3.0) From 124b768f4329cb0190ae85f6fac0a2f5815b38bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 07:04:43 +0000 Subject: [PATCH 055/117] Bump timecop from 0.9.8 to 0.9.9 Bumps [timecop](https://github.com/travisjeffery/timecop) from 0.9.8 to 0.9.9. - [Changelog](https://github.com/travisjeffery/timecop/blob/master/History.md) - [Commits](https://github.com/travisjeffery/timecop/compare/v0.9.8...v0.9.9) --- updated-dependencies: - dependency-name: timecop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1b6e40f16..87604fbc3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -454,7 +454,7 @@ GEM temple (0.10.3) thor (1.3.1) tilt (2.3.0) - timecop (0.9.8) + timecop (0.9.9) timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) From 8872a027e4dc8c58f8561d1921f7b0c63f2c5b5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 07:05:11 +0000 Subject: [PATCH 056/117] Bump acts_as_list from 1.1.0 to 1.2.0 Bumps [acts_as_list](https://github.com/brendon/acts_as_list) from 1.1.0 to 1.2.0. - [Changelog](https://github.com/brendon/acts_as_list/blob/master/CHANGELOG.md) - [Commits](https://github.com/brendon/acts_as_list/compare/v1.1.0...v1.2.0) --- updated-dependencies: - dependency-name: acts_as_list dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 1b6e40f16..52429ef68 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,8 +96,9 @@ GEM tzinfo (~> 2.0) acts-as-taggable-on (10.0.0) activerecord (>= 6.1, < 7.2) - acts_as_list (1.1.0) - activerecord (>= 4.2) + acts_as_list (1.2.0) + activerecord (>= 6.1) + activesupport (>= 6.1) addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) airbrussh (1.5.1) @@ -148,7 +149,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.1) countries (6.0.0) unaccent (~> 0.3) country_select (9.0.0) From bd6ae23fdec624b193441332ac2af52c76a2b18e Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Tue, 4 Jun 2024 04:47:42 +0000 Subject: [PATCH 057/117] Bump rails --- Gemfile.lock | 114 +++++++++++++++++++++++++-------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 07de21e5c..9f09b5838 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,71 +25,71 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) + actioncable (7.0.8.3) + actionpack (= 7.0.8.3) + activesupport (= 7.0.8.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + actionmailbox (7.0.8.3) + actionpack (= 7.0.8.3) + activejob (= 7.0.8.3) + activerecord (= 7.0.8.3) + activestorage (= 7.0.8.3) + activesupport (= 7.0.8.3) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8) - actionpack (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activesupport (= 7.0.8) + actionmailer (7.0.8.3) + actionpack (= 7.0.8.3) + actionview (= 7.0.8.3) + activejob (= 7.0.8.3) + activesupport (= 7.0.8.3) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.8) - actionview (= 7.0.8) - activesupport (= 7.0.8) + actionpack (7.0.8.3) + actionview (= 7.0.8.3) + activesupport (= 7.0.8.3) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8) - actionpack (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + actiontext (7.0.8.3) + actionpack (= 7.0.8.3) + activerecord (= 7.0.8.3) + activestorage (= 7.0.8.3) + activesupport (= 7.0.8.3) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8) - activesupport (= 7.0.8) + actionview (7.0.8.3) + activesupport (= 7.0.8.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8) - activesupport (= 7.0.8) + activejob (7.0.8.3) + activesupport (= 7.0.8.3) globalid (>= 0.3.6) - activemodel (7.0.8) - activesupport (= 7.0.8) + activemodel (7.0.8.3) + activesupport (= 7.0.8.3) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (7.0.8) - activemodel (= 7.0.8) - activesupport (= 7.0.8) - activestorage (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activesupport (= 7.0.8) + activerecord (7.0.8.3) + activemodel (= 7.0.8.3) + activesupport (= 7.0.8.3) + activestorage (7.0.8.3) + actionpack (= 7.0.8.3) + activejob (= 7.0.8.3) + activerecord (= 7.0.8.3) + activesupport (= 7.0.8.3) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.8) + activesupport (7.0.8.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -242,7 +242,7 @@ GEM net-imap net-pop net-smtp - marcel (1.0.2) + marcel (1.0.4) matrix (0.4.2) method_source (1.1.0) mini_magick (4.12.0) @@ -253,7 +253,7 @@ GEM msgpack (1.7.2) mutex_m (0.2.0) nenv (0.3.0) - net-imap (0.4.6) + net-imap (0.4.12) date net-protocol net-pop (0.1.2) @@ -264,10 +264,10 @@ GEM net-ssh (>= 2.6.5, < 8.0.0) net-sftp (4.0.0) net-ssh (>= 5.0.0, < 8.0.0) - net-smtp (0.4.0) + net-smtp (0.5.0) net-protocol net-ssh (7.2.1) - nio4r (2.7.0) + nio4r (2.7.3) nokogiri (1.16.5-arm64-darwin) racc (~> 1.4) nokogiri (1.16.5-x86_64-linux) @@ -301,20 +301,20 @@ GEM rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) - rails (7.0.8) - actioncable (= 7.0.8) - actionmailbox (= 7.0.8) - actionmailer (= 7.0.8) - actionpack (= 7.0.8) - actiontext (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activemodel (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + rails (7.0.8.3) + actioncable (= 7.0.8.3) + actionmailbox (= 7.0.8.3) + actionmailer (= 7.0.8.3) + actionpack (= 7.0.8.3) + actiontext (= 7.0.8.3) + actionview (= 7.0.8.3) + activejob (= 7.0.8.3) + activemodel (= 7.0.8.3) + activerecord (= 7.0.8.3) + activestorage (= 7.0.8.3) + activesupport (= 7.0.8.3) bundler (>= 1.15.0) - railties (= 7.0.8) + railties (= 7.0.8.3) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -342,9 +342,9 @@ GEM railties (> 3.1) rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) + railties (7.0.8.3) + actionpack (= 7.0.8.3) + activesupport (= 7.0.8.3) method_source rake (>= 12.2) thor (~> 1.0) From 7ccbbf59b0f9825aef908d99ad5c1fce9ad02923 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 23:18:15 +0000 Subject: [PATCH 058/117] Bump actionpack from 7.0.8.3 to 7.0.8.4 Bumps [actionpack](https://github.com/rails/rails) from 7.0.8.3 to 7.0.8.4. - [Release notes](https://github.com/rails/rails/releases) - [Changelog](https://github.com/rails/rails/blob/v7.1.3.4/actionpack/CHANGELOG.md) - [Commits](https://github.com/rails/rails/compare/v7.0.8.3...v7.0.8.4) --- updated-dependencies: - dependency-name: actionpack dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 106 +++++++++++++++++++++++++-------------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9f09b5838..47b1e2f37 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -25,71 +25,71 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.0.8.3) - actionpack (= 7.0.8.3) - activesupport (= 7.0.8.3) + actioncable (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8.3) - actionpack (= 7.0.8.3) - activejob (= 7.0.8.3) - activerecord (= 7.0.8.3) - activestorage (= 7.0.8.3) - activesupport (= 7.0.8.3) + actionmailbox (7.0.8.4) + actionpack (= 7.0.8.4) + activejob (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8.3) - actionpack (= 7.0.8.3) - actionview (= 7.0.8.3) - activejob (= 7.0.8.3) - activesupport (= 7.0.8.3) + actionmailer (7.0.8.4) + actionpack (= 7.0.8.4) + actionview (= 7.0.8.4) + activejob (= 7.0.8.4) + activesupport (= 7.0.8.4) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.8.3) - actionview (= 7.0.8.3) - activesupport (= 7.0.8.3) + actionpack (7.0.8.4) + actionview (= 7.0.8.4) + activesupport (= 7.0.8.4) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8.3) - actionpack (= 7.0.8.3) - activerecord (= 7.0.8.3) - activestorage (= 7.0.8.3) - activesupport (= 7.0.8.3) + actiontext (7.0.8.4) + actionpack (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8.3) - activesupport (= 7.0.8.3) + actionview (7.0.8.4) + activesupport (= 7.0.8.4) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8.3) - activesupport (= 7.0.8.3) + activejob (7.0.8.4) + activesupport (= 7.0.8.4) globalid (>= 0.3.6) - activemodel (7.0.8.3) - activesupport (= 7.0.8.3) + activemodel (7.0.8.4) + activesupport (= 7.0.8.4) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (7.0.8.3) - activemodel (= 7.0.8.3) - activesupport (= 7.0.8.3) - activestorage (7.0.8.3) - actionpack (= 7.0.8.3) - activejob (= 7.0.8.3) - activerecord (= 7.0.8.3) - activesupport (= 7.0.8.3) + activerecord (7.0.8.4) + activemodel (= 7.0.8.4) + activesupport (= 7.0.8.4) + activestorage (7.0.8.4) + actionpack (= 7.0.8.4) + activejob (= 7.0.8.4) + activerecord (= 7.0.8.4) + activesupport (= 7.0.8.4) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.8.3) + activesupport (7.0.8.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -301,20 +301,20 @@ GEM rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) - rails (7.0.8.3) - actioncable (= 7.0.8.3) - actionmailbox (= 7.0.8.3) - actionmailer (= 7.0.8.3) - actionpack (= 7.0.8.3) - actiontext (= 7.0.8.3) - actionview (= 7.0.8.3) - activejob (= 7.0.8.3) - activemodel (= 7.0.8.3) - activerecord (= 7.0.8.3) - activestorage (= 7.0.8.3) - activesupport (= 7.0.8.3) + rails (7.0.8.4) + actioncable (= 7.0.8.4) + actionmailbox (= 7.0.8.4) + actionmailer (= 7.0.8.4) + actionpack (= 7.0.8.4) + actiontext (= 7.0.8.4) + actionview (= 7.0.8.4) + activejob (= 7.0.8.4) + activemodel (= 7.0.8.4) + activerecord (= 7.0.8.4) + activestorage (= 7.0.8.4) + activesupport (= 7.0.8.4) bundler (>= 1.15.0) - railties (= 7.0.8.3) + railties (= 7.0.8.4) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -342,9 +342,9 @@ GEM railties (> 3.1) rails_serve_static_assets (0.0.5) rails_stdout_logging (0.0.5) - railties (7.0.8.3) - actionpack (= 7.0.8.3) - activesupport (= 7.0.8.3) + railties (7.0.8.4) + actionpack (= 7.0.8.4) + activesupport (= 7.0.8.4) method_source rake (>= 12.2) thor (~> 1.0) From 8263dfa839a55cc0937b4c4c79af2eded527adae Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Wed, 5 Jun 2024 14:13:26 +0930 Subject: [PATCH 059/117] Ruby 3.3 (stacked PR) (#1221) * Ruby 3.3.0 * Ruby 3.3 * Ruby version * Rubocop * Bump ruby --- .github/workflows/ruby.yml | 2 +- .rubocop.yml | 2 +- .ruby-version | 2 +- Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index fffca5948..729de94a2 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ruby-version: ['3.2'] # , '2.7', '3.0' + ruby-version: ['3.3'] # , '2.7', '3.0' steps: - uses: actions/checkout@v4 diff --git a/.rubocop.yml b/.rubocop.yml index bc63fa3f0..e2ccfb050 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,7 +1,7 @@ inherit_from: .rubocop_todo.yml AllCops: - TargetRubyVersion: 3.2 + TargetRubyVersion: 3.3 Bundler/OrderedGems: Enabled: false diff --git a/.ruby-version b/.ruby-version index be94e6f53..477254331 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.2 +3.3.2 diff --git a/Dockerfile b/Dockerfile index fae6c179f..2958a9ee9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # docker-compose up # docker-compose exec web bundle exec rake db:create db:schema:load ffcrm:demo:load -FROM ruby:3.2 +FROM ruby:3.3 LABEL author="Steve Kenworthy" From 0a7a4024c348e66b8895915ee5532dc004f628a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 Jun 2024 07:59:46 +0000 Subject: [PATCH 060/117] Bump acts_as_list from 1.2.0 to 1.2.1 Bumps [acts_as_list](https://github.com/brendon/acts_as_list) from 1.2.0 to 1.2.1. - [Changelog](https://github.com/brendon/acts_as_list/blob/master/CHANGELOG.md) - [Commits](https://github.com/brendon/acts_as_list/compare/v1.2.0...v1.2.1) --- updated-dependencies: - dependency-name: acts_as_list dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 47b1e2f37..45aec884d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,7 +96,7 @@ GEM tzinfo (~> 2.0) acts-as-taggable-on (10.0.0) activerecord (>= 6.1, < 7.2) - acts_as_list (1.2.0) + acts_as_list (1.2.1) activerecord (>= 6.1) activesupport (>= 6.1) addressable (2.8.6) From 20b9cac343f02a710f3be3c5fc8b211b64d2463e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 07:50:15 +0000 Subject: [PATCH 061/117] Bump sprockets-rails from 3.4.2 to 3.5.0 Bumps [sprockets-rails](https://github.com/rails/sprockets-rails) from 3.4.2 to 3.5.0. - [Release notes](https://github.com/rails/sprockets-rails/releases) - [Commits](https://github.com/rails/sprockets-rails/compare/v3.4.2...v3.5.0) --- updated-dependencies: - dependency-name: sprockets-rails dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 45aec884d..c295e36d3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -115,7 +115,7 @@ GEM sassc-rails (>= 2.0.0) brakeman (6.1.2) racc - builder (3.2.4) + builder (3.3.0) byebug (11.1.3) cancancan (3.6.1) capistrano (3.18.1) @@ -440,9 +440,9 @@ GEM sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + sprockets-rails (3.5.0) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) sqlite3 (1.6.9-arm64-darwin) sqlite3 (1.6.9-x86_64-linux) From 965e333a64bd88e5f503b72a85ba54717505734a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 07:22:56 +0000 Subject: [PATCH 062/117] Bump sprockets-rails from 3.5.0 to 3.5.1 Bumps [sprockets-rails](https://github.com/rails/sprockets-rails) from 3.5.0 to 3.5.1. - [Release notes](https://github.com/rails/sprockets-rails/releases) - [Commits](https://github.com/rails/sprockets-rails/compare/v3.5.0...v3.5.1) --- updated-dependencies: - dependency-name: sprockets-rails dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c295e36d3..fa599e2c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -149,7 +149,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.3.1) + concurrent-ruby (1.3.3) countries (6.0.0) unaccent (~> 0.3) country_select (9.0.0) @@ -440,7 +440,7 @@ GEM sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) - sprockets-rails (3.5.0) + sprockets-rails (3.5.1) actionpack (>= 6.1) activesupport (>= 6.1) sprockets (>= 3.0.0) From 0e4c0057c3d2ab9b8f2714135286f46aade1075b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 07:54:02 +0000 Subject: [PATCH 063/117] Bump will_paginate from 4.0.0 to 4.0.1 Bumps [will_paginate](https://github.com/mislav/will_paginate) from 4.0.0 to 4.0.1. - [Release notes](https://github.com/mislav/will_paginate/releases) - [Commits](https://github.com/mislav/will_paginate/compare/v4.0.0...v4.0.1) --- updated-dependencies: - dependency-name: will_paginate dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c295e36d3..c43872dc6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -474,7 +474,7 @@ GEM websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - will_paginate (4.0.0) + will_paginate (4.0.1) xpath (3.2.0) nokogiri (~> 1.8) zeitwerk (2.6.15) From 1fa830cf066881b759b8cb689d5a2f5efbd7d972 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 07:48:19 +0000 Subject: [PATCH 064/117] Bump nokogiri from 1.16.5 to 1.16.6 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.16.5 to 1.16.6. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.16.6/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.16.5...v1.16.6) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c43872dc6..b43425ab6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -268,9 +268,9 @@ GEM net-protocol net-ssh (7.2.1) nio4r (2.7.3) - nokogiri (1.16.5-arm64-darwin) + nokogiri (1.16.6-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.5-x86_64-linux) + nokogiri (1.16.6-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) From 3648696bde7da425aec221164d36975d160446e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 07:49:27 +0000 Subject: [PATCH 065/117] Bump mini_magick from 4.12.0 to 4.13.0 Bumps [mini_magick](https://github.com/minimagick/minimagick) from 4.12.0 to 4.13.0. - [Release notes](https://github.com/minimagick/minimagick/releases) - [Commits](https://github.com/minimagick/minimagick/compare/v4.12.0...v4.13.0) --- updated-dependencies: - dependency-name: mini_magick dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c43872dc6..6b6818750 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -245,7 +245,7 @@ GEM marcel (1.0.4) matrix (0.4.2) method_source (1.1.0) - mini_magick (4.12.0) + mini_magick (4.13.0) mini_mime (1.1.5) mini_racer (0.12.0) libv8-node (~> 21.7.2.0) From 35fb7951766ca2c856c37d1fbc62fc1f07e69545 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 07:18:04 +0000 Subject: [PATCH 066/117] Bump timecop from 0.9.9 to 0.9.10 Bumps [timecop](https://github.com/travisjeffery/timecop) from 0.9.9 to 0.9.10. - [Changelog](https://github.com/travisjeffery/timecop/blob/master/History.md) - [Commits](https://github.com/travisjeffery/timecop/compare/v0.9.9...v0.9.10) --- updated-dependencies: - dependency-name: timecop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 774cce087..48f64e5e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -455,7 +455,7 @@ GEM temple (0.10.3) thor (1.3.1) tilt (2.3.0) - timecop (0.9.9) + timecop (0.9.10) timeout (0.4.1) tzinfo (2.0.6) concurrent-ruby (~> 1.0) From 37cccfbf7de78014bc2796174364da8e58aee9e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jun 2024 07:20:13 +0000 Subject: [PATCH 067/117] Bump mini_magick from 4.13.0 to 4.13.1 Bumps [mini_magick](https://github.com/minimagick/minimagick) from 4.13.0 to 4.13.1. - [Release notes](https://github.com/minimagick/minimagick/releases) - [Commits](https://github.com/minimagick/minimagick/compare/v4.13.0...v4.13.1) --- updated-dependencies: - dependency-name: mini_magick dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 774cce087..98e869af0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -245,7 +245,7 @@ GEM marcel (1.0.4) matrix (0.4.2) method_source (1.1.0) - mini_magick (4.13.0) + mini_magick (4.13.1) mini_mime (1.1.5) mini_racer (0.12.0) libv8-node (~> 21.7.2.0) From 7512b36a8aed640a5440b6273075a83988b13172 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 07:19:19 +0000 Subject: [PATCH 068/117] Bump pry-rails from 0.3.9 to 0.3.11 Bumps [pry-rails](https://github.com/rweng/pry-rails) from 0.3.9 to 0.3.11. - [Commits](https://github.com/rweng/pry-rails/compare/v0.3.9...v0.3.11) --- updated-dependencies: - dependency-name: pry-rails dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fc148810b..9463ead6b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -292,8 +292,8 @@ GEM pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) - pry-rails (0.3.9) - pry (>= 0.10.4) + pry-rails (0.3.11) + pry (>= 0.13.0) public_suffix (5.0.4) puma (6.4.2) nio4r (~> 2.0) From 15e9cc6e0e61fba2c96b9445de2d8a038fcc8e57 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 07:22:09 +0000 Subject: [PATCH 069/117] Bump rspec-rails from 6.1.2 to 6.1.3 Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 6.1.2 to 6.1.3. - [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v6.1.2...v6.1.3) --- updated-dependencies: - dependency-name: rspec-rails dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index fc148810b..f402ec138 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -179,7 +179,7 @@ GEM actionview (> 5.2.0) activemodel (> 5.2.0) email_reply_parser_ffcrm (0.5.0) - erubi (1.12.0) + erubi (1.13.0) execjs (2.9.1) factory_bot (6.4.5) activesupport (>= 5.0.0) @@ -249,7 +249,7 @@ GEM mini_mime (1.1.5) mini_racer (0.12.0) libv8-node (~> 21.7.2.0) - minitest (5.23.1) + minitest (5.24.0) msgpack (1.7.2) mutex_m (0.2.0) nenv (0.3.0) @@ -383,13 +383,13 @@ GEM rspec-mocks (>= 2.99, < 4.0) rspec-core (3.13.0) rspec-support (~> 3.13.0) - rspec-expectations (3.13.0) + rspec-expectations (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.0) + rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (6.1.2) + rspec-rails (6.1.3) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) @@ -477,7 +477,7 @@ GEM will_paginate (4.0.1) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.15) + zeitwerk (2.6.16) zeus (0.16.0) method_source (>= 0.6.7) From 32fe449f73aa4b60bf0a88ca075749f45d736147 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 07:25:15 +0000 Subject: [PATCH 070/117] Bump capistrano from 3.18.1 to 3.19.0 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.18.1 to 3.19.0. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.18.1...v3.19.0) --- updated-dependencies: - dependency-name: capistrano dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b60e047dc..7c4caaf02 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -101,11 +101,12 @@ GEM activesupport (>= 6.1) addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) - airbrussh (1.5.1) + airbrussh (1.5.2) sshkit (>= 1.6.1, != 1.7.0) ast (2.4.2) autoprefixer-rails (10.4.16.0) execjs (~> 2) + base64 (0.2.0) bcrypt (3.1.20) bootsnap (1.18.3) msgpack (~> 1.2) @@ -118,7 +119,7 @@ GEM builder (3.3.0) byebug (11.1.3) cancancan (3.6.1) - capistrano (3.18.1) + capistrano (3.19.0) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) @@ -251,7 +252,6 @@ GEM libv8-node (~> 21.7.2.0) minitest (5.24.0) msgpack (1.7.2) - mutex_m (0.2.0) nenv (0.3.0) net-imap (0.4.12) date @@ -266,7 +266,7 @@ GEM net-ssh (>= 5.0.0, < 8.0.0) net-smtp (0.5.0) net-protocol - net-ssh (7.2.1) + net-ssh (7.2.3) nio4r (2.7.3) nokogiri (1.16.6-arm64-darwin) racc (~> 1.4) @@ -446,8 +446,8 @@ GEM sprockets (>= 3.0.0) sqlite3 (1.6.9-arm64-darwin) sqlite3 (1.6.9-x86_64-linux) - sshkit (1.22.0) - mutex_m + sshkit (1.23.0) + base64 net-scp (>= 1.1.2) net-sftp (>= 2.1.2) net-ssh (>= 2.8.0) From 7cdd31f01e728b4e4b8d430e5b39551b12d2b6a9 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Sat, 29 Jun 2024 17:53:26 +0930 Subject: [PATCH 071/117] Update 20230526212613_convert_to_active_storage.rb Fix #1298 --- db/migrate/20230526212613_convert_to_active_storage.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20230526212613_convert_to_active_storage.rb b/db/migrate/20230526212613_convert_to_active_storage.rb index b2fa8d38c..5f0921b94 100644 --- a/db/migrate/20230526212613_convert_to_active_storage.rb +++ b/db/migrate/20230526212613_convert_to_active_storage.rb @@ -16,7 +16,7 @@ def up end ActiveRecord::Base.connection.raw_connection.then do |conn| - if conn.is_a?(PG::Connection) + if conn.is_a?(::PG::Connection) conn.prepare('active_storage_blobs', <<-SQL) INSERT INTO active_storage_blobs ( key, filename, content_type, metadata, byte_size, checksum, created_at From 95da60345c0d7c3bff691e63f16f9a9811e237be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 07:55:20 +0000 Subject: [PATCH 072/117] Bump capistrano from 3.19.0 to 3.19.1 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.19.0 to 3.19.1. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.19.0...v3.19.1) --- updated-dependencies: - dependency-name: capistrano dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7c4caaf02..faa9710c4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,7 +119,7 @@ GEM builder (3.3.0) byebug (11.1.3) cancancan (3.6.1) - capistrano (3.19.0) + capistrano (3.19.1) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) From 548a599196de44d41a84adf596d5cba64fa75916 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 9 Jul 2024 07:14:09 +0000 Subject: [PATCH 073/117] Bump mini_magick from 4.13.1 to 4.13.2 Bumps [mini_magick](https://github.com/minimagick/minimagick) from 4.13.1 to 4.13.2. - [Release notes](https://github.com/minimagick/minimagick/releases) - [Commits](https://github.com/minimagick/minimagick/compare/v4.13.1...v4.13.2) --- updated-dependencies: - dependency-name: mini_magick dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index faa9710c4..f18a278d3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -246,7 +246,7 @@ GEM marcel (1.0.4) matrix (0.4.2) method_source (1.1.0) - mini_magick (4.13.1) + mini_magick (4.13.2) mini_mime (1.1.5) mini_racer (0.12.0) libv8-node (~> 21.7.2.0) From 4dfacbbf9d0343ccd74ddde3a57ef718af90d9c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 07:56:47 +0000 Subject: [PATCH 074/117] Bump rubocop from 1.64.1 to 1.65.0 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.64.1 to 1.65.0. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.64.1...v1.65.0) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f18a278d3..bbb2c5672 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -279,8 +279,8 @@ GEM paper_trail (15.1.0) activerecord (>= 6.1) request_store (~> 1.4) - parallel (1.24.0) - parser (3.3.2.0) + parallel (1.25.1) + parser (3.3.4.0) ast (~> 2.4.1) racc pg (1.5.6) @@ -371,8 +371,8 @@ GEM responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.2.8) - strscan (>= 3.0.9) + rexml (3.3.1) + strscan rspec (3.13.0) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) @@ -398,13 +398,13 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.64.1) + rubocop (1.65.0) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) + regexp_parser (>= 2.4, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) From 02691b4db0fcd3a579389dda6bc441cfd6fd20f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2024 07:42:46 +0000 Subject: [PATCH 075/117] Bump acts_as_list from 1.2.1 to 1.2.2 Bumps [acts_as_list](https://github.com/brendon/acts_as_list) from 1.2.1 to 1.2.2. - [Changelog](https://github.com/brendon/acts_as_list/blob/master/CHANGELOG.md) - [Commits](https://github.com/brendon/acts_as_list/compare/v1.2.1...v1.2.2) --- updated-dependencies: - dependency-name: acts_as_list dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index bbb2c5672..8009124de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -96,7 +96,7 @@ GEM tzinfo (~> 2.0) acts-as-taggable-on (10.0.0) activerecord (>= 6.1, < 7.2) - acts_as_list (1.2.1) + acts_as_list (1.2.2) activerecord (>= 6.1) activesupport (>= 6.1) addressable (2.8.6) @@ -250,7 +250,7 @@ GEM mini_mime (1.1.5) mini_racer (0.12.0) libv8-node (~> 21.7.2.0) - minitest (5.24.0) + minitest (5.24.1) msgpack (1.7.2) nenv (0.3.0) net-imap (0.4.12) From ec5f66bc700a79512c11c14f6d0bae8a61c8c9de Mon Sep 17 00:00:00 2001 From: Stanley Hansen Date: Fri, 19 Jul 2024 17:47:17 +0800 Subject: [PATCH 076/117] Fix saving search list (#1305) * Fix search list, optional and attr * Added some specs for ListController. * Fix some rubocop issues --------- Co-authored-by: Stephen Kenworthy --- app/controllers/lists_controller.rb | 9 +++--- app/models/list.rb | 2 +- spec/controllers/lists_controller_spec.rb | 39 +++++++++++++++++++++++ 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/app/controllers/lists_controller.rb b/app/controllers/lists_controller.rb index 1d7c5739c..cb48bc175 100644 --- a/app/controllers/lists_controller.rb +++ b/app/controllers/lists_controller.rb @@ -9,13 +9,14 @@ class ListsController < ApplicationController # POST /lists #---------------------------------------------------------------------------- def create - list_params[:user_id] = (current_user.id if params[:is_global].to_i.zero?) + list_attr = list_params.to_h + list_attr["user_id"] = current_user.id if params["is_global"] != "1" # Find any existing list with the same name (case insensitive) - if @list = List.where("lower(name) = ?", list_params[:name].downcase).where(user_id: list_params[:user_id]).first - @list.update(list_params) + if @list = List.where("lower(name) = ?", list_attr[:name].downcase).where(user_id: list_attr[:user_id]).first + @list.update(list_attr) else - @list = List.create(list_params) + @list = List.create(list_attr) end respond_with(@list) diff --git a/app/models/list.rb b/app/models/list.rb index a51eb8093..4a54ea4b5 100644 --- a/app/models/list.rb +++ b/app/models/list.rb @@ -8,7 +8,7 @@ class List < ActiveRecord::Base validates_presence_of :name validates_presence_of :url - belongs_to :user + belongs_to :user, optional: true # Parses the controller from the url def controller diff --git a/spec/controllers/lists_controller_spec.rb b/spec/controllers/lists_controller_spec.rb index 94baede2f..8affd9ba2 100644 --- a/spec/controllers/lists_controller_spec.rb +++ b/spec/controllers/lists_controller_spec.rb @@ -8,4 +8,43 @@ require 'spec_helper' describe ListsController do + before(:each) do + login + end + + let(:list_url) { "/contacts?q%5Bs%5D%5B0%5D%5Bname%5D=&q%5Bs%5D%5B0%5D%5Bdir%5D=asc&q%5Bg%5D%5B0%5D%5Bm%5D=and&q%5Bg%5D%5B0%5D%5Bc%5D%5B0%5D%5Ba%5D%5B0%5D%5Bname%5D=first_name&q%5Bg%5D%5B0%5D%5Bc%5D%5B0%5D%5Bp%5D=cont&q%5Bg%5D%5B0%5D%5Bc%5D%5B0%5D%5Bv%5D%5B0%5D%5Bvalue%5D=test&distinct=1&page=1" } + + describe "global list items" do + let(:list_name) { "Global list item" } + let(:is_global) { "1" } + it "creating should be successful" do + post :create, params: { list: { name: list_name, url: list_url }, is_global: is_global }, xhr: true + expect(assigns(:list).persisted?).to eql(true) + expect(response).to render_template("lists/create") + end + it "updating should be successful" do + @list = List.create!(name: list_name, url: "/test") + post :create, params: { list: { name: list_name, url: list_url }, is_global: is_global }, xhr: true + expect(assigns(:list).persisted?).to eql(true) + expect(@list.reload.url).to eql(list_url) + expect(response).to render_template("lists/create") + end + it "delete list item" do + @list = List.create!(name: list_name, url: "/test") + delete :destroy, params: { id: @list.id }, xhr: true + expect { List.find(@list.id) }.to raise_error(ActiveRecord::RecordNotFound) + expect(response).to render_template("lists/destroy") + end + end + + describe "personal list items" do + let(:list_name) { "Personal list item" } + let(:is_global) { "0" } + + it "creating should be successful" do + post :create, params: { list: { name: list_name, url: list_url }, is_global: is_global }, xhr: true + expect(assigns(:list).persisted?).to eql(true) + expect(response).to render_template("lists/create") + end + end end From bbe19124786a31599f108c57e65ad3ac17396dbd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 Jul 2024 08:02:40 +0000 Subject: [PATCH 077/117] Bump image_processing from 1.12.2 to 1.13.0 Bumps [image_processing](https://github.com/janko/image_processing) from 1.12.2 to 1.13.0. - [Changelog](https://github.com/janko/image_processing/blob/master/CHANGELOG.md) - [Commits](https://github.com/janko/image_processing/compare/v1.12.2...v1.13.0) --- updated-dependencies: - dependency-name: image_processing dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index bbb2c5672..0a067a8be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -188,7 +188,8 @@ GEM factory_bot (~> 6.4) railties (>= 5.0.0) ffaker (2.23.0) - ffi (1.16.3) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86_64-linux-gnu) font-awesome-rails (4.7.0.8) railties (>= 3.2, < 8.0) formatador (1.1.0) @@ -219,7 +220,7 @@ GEM htmlentities (4.3.4) i18n (1.14.5) concurrent-ruby (~> 1.0) - image_processing (1.12.2) + image_processing (1.13.0) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) jquery-migrate-rails (1.2.1) @@ -234,6 +235,7 @@ GEM listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.0) loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) @@ -412,8 +414,9 @@ GEM rubocop-ast (1.31.3) parser (>= 3.3.1.0) ruby-progressbar (1.13.0) - ruby-vips (2.2.0) + ruby-vips (2.2.2) ffi (~> 1.12) + logger rubyzip (2.3.2) sass (3.7.4) sass-listen (~> 4.0.0) From 8881a1bd1a43ee35290b910d43756055f4ac14c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2024 14:19:19 +0000 Subject: [PATCH 078/117] Bump rexml from 3.3.1 to 3.3.2 Bumps [rexml](https://github.com/ruby/rexml) from 3.3.1 to 3.3.2. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.3.1...v3.3.2) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0a067a8be..1222ac622 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -373,7 +373,7 @@ GEM responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.3.1) + rexml (3.3.2) strscan rspec (3.13.0) rspec-core (~> 3.13.0) From db8c04d96bca66a621a6a4ccc1d716d2cc153d18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 07:50:58 +0000 Subject: [PATCH 079/117] Bump nokogiri from 1.16.6 to 1.16.7 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.16.6 to 1.16.7. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.16.6...v1.16.7) --- updated-dependencies: - dependency-name: nokogiri dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 59e4a0882..a4567db2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -270,9 +270,9 @@ GEM net-protocol net-ssh (7.2.3) nio4r (2.7.3) - nokogiri (1.16.6-arm64-darwin) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.6-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) From bc1205635e78de684ffdfca48da70c8923423b10 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 07:52:06 +0000 Subject: [PATCH 080/117] Bump mini_racer from 0.12.0 to 0.13.0 Bumps [mini_racer](https://github.com/discourse/mini_racer) from 0.12.0 to 0.13.0. - [Changelog](https://github.com/rubyjs/mini_racer/blob/main/CHANGELOG) - [Commits](https://github.com/discourse/mini_racer/compare/v0.12.0...v0.13.0) --- updated-dependencies: - dependency-name: mini_racer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 59e4a0882..5914bed1f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -230,8 +230,8 @@ GEM thor (>= 0.14, < 2.0) json (2.7.2) language_server-protocol (3.17.0.3) - libv8-node (21.7.2.0-arm64-darwin) - libv8-node (21.7.2.0-x86_64-linux) + libv8-node (22.5.1.0-arm64-darwin) + libv8-node (22.5.1.0-x86_64-linux) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -250,8 +250,8 @@ GEM method_source (1.1.0) mini_magick (4.13.2) mini_mime (1.1.5) - mini_racer (0.12.0) - libv8-node (~> 21.7.2.0) + mini_racer (0.13.0) + libv8-node (~> 22.5.1.0) minitest (5.24.1) msgpack (1.7.2) nenv (0.3.0) From 0ed3109a905154fbe31410925c81922c6e1ce3c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Jul 2024 07:53:16 +0000 Subject: [PATCH 081/117] Bump pg from 1.5.6 to 1.5.7 Bumps [pg](https://github.com/ged/ruby-pg) from 1.5.6 to 1.5.7. - [Changelog](https://github.com/ged/ruby-pg/blob/master/History.md) - [Commits](https://github.com/ged/ruby-pg/compare/v1.5.6...v1.5.7) --- updated-dependencies: - dependency-name: pg dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 59e4a0882..69aae1ef2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -285,7 +285,7 @@ GEM parser (3.3.4.0) ast (~> 2.4.1) racc - pg (1.5.6) + pg (1.5.7) popper_js (2.11.8) premailer (1.23.0) addressable From 9c418859f94a5755ebe777a7366e1dd8c3adc0c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 07:13:37 +0000 Subject: [PATCH 082/117] Bump sprockets-rails from 3.5.1 to 3.5.2 Bumps [sprockets-rails](https://github.com/rails/sprockets-rails) from 3.5.1 to 3.5.2. - [Release notes](https://github.com/rails/sprockets-rails/releases) - [Commits](https://github.com/rails/sprockets-rails/compare/v3.5.1...v3.5.2) --- updated-dependencies: - dependency-name: sprockets-rails dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4d79987b6..8bbbce1b9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -299,7 +299,7 @@ GEM public_suffix (5.0.4) puma (6.4.2) nio4r (~> 2.0) - racc (1.8.0) + racc (1.8.1) rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) @@ -443,7 +443,7 @@ GEM sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) - sprockets-rails (3.5.1) + sprockets-rails (3.5.2) actionpack (>= 6.1) activesupport (>= 6.1) sprockets (>= 3.0.0) From 0b9f51547a5e6c7d374a4cd8071470fa867902cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 07:14:11 +0000 Subject: [PATCH 083/117] Bump rubocop from 1.65.0 to 1.65.1 Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.65.0 to 1.65.1. - [Release notes](https://github.com/rubocop/rubocop/releases) - [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop/compare/v1.65.0...v1.65.1) --- updated-dependencies: - dependency-name: rubocop dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4d79987b6..ace500567 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -299,7 +299,7 @@ GEM public_suffix (5.0.4) puma (6.4.2) nio4r (~> 2.0) - racc (1.8.0) + racc (1.8.1) rack (2.2.9) rack-test (2.1.0) rack (>= 1.3) @@ -373,7 +373,7 @@ GEM responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.3.2) + rexml (3.3.3) strscan rspec (3.13.0) rspec-core (~> 3.13.0) @@ -400,7 +400,7 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.65.0) + rubocop (1.65.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) From 040415ac6ce01ca11d9e9e1c8571b4fd8dac33ef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2024 07:26:06 +0000 Subject: [PATCH 084/117] Bump bootsnap from 1.18.3 to 1.18.4 Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.18.3 to 1.18.4. - [Changelog](https://github.com/Shopify/bootsnap/blob/main/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.18.3...v1.18.4) --- updated-dependencies: - dependency-name: bootsnap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f2108ccba..c11f84d3e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -108,7 +108,7 @@ GEM execjs (~> 2) base64 (0.2.0) bcrypt (3.1.20) - bootsnap (1.18.3) + bootsnap (1.18.4) msgpack (~> 1.2) bootstrap (5.0.2) autoprefixer-rails (>= 9.1.0) From a37069242575afff8639687db05fa2a85c1ea70b Mon Sep 17 00:00:00 2001 From: Stanley Date: Tue, 6 Aug 2024 18:35:14 +0800 Subject: [PATCH 085/117] Fix custom fields-datepair-datetimepair --- app/controllers/admin/fields_controller.rb | 33 +++++++++++-------- app/models/fields/custom_field_pair.rb | 11 +++---- .../custom_fields/_date_pair_field.html.haml | 2 +- 3 files changed, 25 insertions(+), 21 deletions(-) diff --git a/app/controllers/admin/fields_controller.rb b/app/controllers/admin/fields_controller.rb index e46fc1ce0..35974bc88 100644 --- a/app/controllers/admin/fields_controller.rb +++ b/app/controllers/admin/fields_controller.rb @@ -33,7 +33,7 @@ def new # GET /fields/1/edit AJAX #---------------------------------------------------------------------------- def edit - @field = Field.find(params[:id]) + @field = Field.find(params["id"]) respond_with(@field) end @@ -41,10 +41,10 @@ def edit # POST /fields.xml AJAX #---------------------------------------------------------------------------- def create - as = field_params[:as] + as = field_params["as"] @field = if as.match?(/pair/) - CustomFieldPair.create_pair(params).first + CustomFieldPair.create_pair("pair" => pair_params, "field" => field_params).first elsif as.present? klass = find_class(Field.lookup_class(as)) klass.create(field_params) @@ -59,10 +59,10 @@ def create # PUT /fields/1.xml AJAX #---------------------------------------------------------------------------- def update - if field_params[:as].match?(/pair/) - @field = CustomFieldPair.update_pair(params).first + if field_params["as"].match?(/pair/) + @field = CustomFieldPair.update_pair("pair" => pair_params, "field" => field_params).first else - @field = Field.find(params[:id]) + @field = Field.find(params["id"]) @field.update(field_params) end @@ -73,7 +73,7 @@ def update # DELETE /fields/1.xml HTML and AJAX #---------------------------------------------------------------------------- def destroy - @field = Field.find(params[:id]) + @field = Field.find(params["id"]) @field.destroy respond_with(@field) @@ -82,11 +82,11 @@ def destroy # POST /fields/sort #---------------------------------------------------------------------------- def sort - field_group_id = params[:field_group_id].to_i + field_group_id = params["field_group_id"].to_i field_ids = params["fields_field_group_#{field_group_id}"] || [] field_ids.each_with_index do |id, index| - Field.where(id: id).update_all(position: index + 1, field_group_id: field_group_id) + Field.where(id:).update_all(position: index + 1, field_group_id:) end render nothing: true @@ -96,14 +96,13 @@ def sort #---------------------------------------------------------------------------- def subform field = field_params - as = field[:as] - + as = field_params["as"] @field = if (id = field[:id]).present? Field.find(id).tap { |f| f.as = as } else field_group_id = field[:field_group_id] - klass = find_class(Field.lookup_class(as)) - klass.new(field_group_id: field_group_id, as: as) + klass = Field.lookup_class(as).safe_constantize + klass.new(field_group_id:, as:) end respond_with(@field) do |format| @@ -114,7 +113,13 @@ def subform protected def field_params - params[:field].permit! + # Sets the +permitted+ attribute to +true+. This can be used to pass + # mass assignment. Returns +self+. + params.require(:field).permit! + end + + def pair_params + params.require(:pair).permit! end def setup_current_tab diff --git a/app/models/fields/custom_field_pair.rb b/app/models/fields/custom_field_pair.rb index 07f41f28c..2b419b243 100644 --- a/app/models/fields/custom_field_pair.rb +++ b/app/models/fields/custom_field_pair.rb @@ -12,10 +12,9 @@ class CustomFieldPair < CustomField #------------------------------------------------------------------------------ def self.create_pair(params) fields = params['field'] - as = params['field']['as'] - pair = params.delete('pair') + pair = params['pair'] base_params = fields.delete_if { |k, _v| !%w[field_group_id label as].include?(k) } - klass = ("custom_field_" + as.gsub('pair', '_pair')).classify.constantize + klass = ("custom_field_" + fields['as'].gsub('pair', '_pair')).classify.constantize field1 = klass.create(base_params.merge(pair['0'])) field2 = klass.create(base_params.merge(pair['1']).merge('pair_id' => field1.id, 'required' => field1.required, 'disabled' => field1.disabled)) [field1, field2] @@ -25,9 +24,9 @@ def self.create_pair(params) #------------------------------------------------------------------------------ def self.update_pair(params) fields = params['field'] - pair = params.delete('pair') + pair = params['pair'] base_params = fields.delete_if { |k, _v| !%w[field_group_id label as].include?(k) } - field1 = CustomFieldPair.find(params['id']) + field1 = CustomFieldPair.find(pair['0']['id']) field1.update(base_params.merge(pair['0'])) field2 = field1.paired_with field2.update(base_params.merge(pair['1']).merge('required' => field1.required, 'disabled' => field1.disabled)) @@ -37,7 +36,7 @@ def self.update_pair(params) # Returns the field that this field is paired with #------------------------------------------------------------------------------ def paired_with - pair || CustomFieldPair.where(pair_id: id).first + pair end ActiveSupport.run_load_hooks(:fat_free_crm_custom_field_pair, self) diff --git a/app/views/admin/custom_fields/_date_pair_field.html.haml b/app/views/admin/custom_fields/_date_pair_field.html.haml index 90afcbccc..0aaffd133 100644 --- a/app/views/admin/custom_fields/_date_pair_field.html.haml +++ b/app/views/admin/custom_fields/_date_pair_field.html.haml @@ -1,5 +1,5 @@ - field1 = f.object || CustomFieldPair.new -- field2 = f.object.respond_to?(:paired_with) ? field1.paired_with : CustomFieldPair.new +- field2 = (field1.pair || CustomFieldPair.new) %table{class: :pairs} = fields_for("pair[0]", field1) do |first| From 46a862232654f7301eea1a869c803a74a1475b11 Mon Sep 17 00:00:00 2001 From: Stanley Date: Tue, 6 Aug 2024 17:05:57 +0800 Subject: [PATCH 086/117] Use group view for custom fields --- app/views/fields/_sidebar_show.html.haml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/app/views/fields/_sidebar_show.html.haml b/app/views/fields/_sidebar_show.html.haml index c22371f7c..4aedeeeef 100755 --- a/app/views/fields/_sidebar_show.html.haml +++ b/app/views/fields/_sidebar_show.html.haml @@ -1,9 +1,6 @@ - asset.field_groups.each do |field_group| - - fg = field_group.fields.without_pairs - - if fg.select{|f| asset.send(f.name).present? }.any? - %div - - unless field_group.name == 'custom_fields' - .caption #{field_group.label_i18n} - - fg.each do |field| - - if (value = field.render_value(asset)).present? - == #{field.label}:
#{truncate(value, length: 35)}
+ - fields = field_group.fields.without_pairs + - if fields.select{|f| asset.send(f.name).present? }.any? + - unless field_group.name == 'custom_fields' + .caption #{field_group.label_i18n} + = render("fields/group_view", fields: fields, entity: asset) unless fields.nil? From cb4ab0df1eb236bca91610e6226432316ad1e942 Mon Sep 17 00:00:00 2001 From: Stanley Date: Tue, 30 Jul 2024 11:31:48 +0800 Subject: [PATCH 087/117] Fix formatting base URL --- app/views/layouts/application.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 0f26baf0a..64808e22f 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -42,7 +42,7 @@ = render "layouts/footer" %script{type: "text/javascript"} - = "crm.base_url = '#{Setting.base_url}';" unless Setting.base_url.blank? + = "crm.base_url = '#{h Setting.base_url}';".html_safe unless Setting.base_url.blank? = get_browser_timezone_offset = content_for :javascript_epilogue = hook(:javascript_epilogue, self) From 9263e88f16d809982373a52acf844417d42a344a Mon Sep 17 00:00:00 2001 From: Stanley Date: Tue, 6 Aug 2024 17:17:11 +0800 Subject: [PATCH 088/117] Fix custom fields text new line not showing --- app/views/fields/_group_view.html.haml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/fields/_group_view.html.haml b/app/views/fields/_group_view.html.haml index ab074503e..a08572bbb 100755 --- a/app/views/fields/_group_view.html.haml +++ b/app/views/fields/_group_view.html.haml @@ -4,7 +4,10 @@ %tr - group.each do |field| = col(field.label, (i == groups.size - 1) ? :last : nil) do - = field.render_value(entity) + - if field.as == "text" + = simple_format(field.render_value(entity)) + - else + = field.render_value(entity) - if group.size == 1 %th.last %td.last From 428bc4074c220e34d20d4731fc053cc43d861c91 Mon Sep 17 00:00:00 2001 From: Stanley Date: Tue, 6 Aug 2024 17:29:25 +0800 Subject: [PATCH 089/117] Fix custom fields checkbox display --- app/models/fields/field.rb | 2 -- app/views/fields/_group_table.html.haml | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/app/models/fields/field.rb b/app/models/fields/field.rb index 149ca89aa..4f333c343 100644 --- a/app/models/fields/field.rb +++ b/app/models/fields/field.rb @@ -92,8 +92,6 @@ def render_value(object) def render(value) case as - when 'checkbox' - value.to_s == '0' ? "no" : "yes" when 'date' value&.strftime(I18n.t("date.formats.mmddyy")) when 'datetime' diff --git a/app/views/fields/_group_table.html.haml b/app/views/fields/_group_table.html.haml index 4c103e88d..f06f3b0c8 100644 --- a/app/views/fields/_group_table.html.haml +++ b/app/views/fields/_group_table.html.haml @@ -5,11 +5,8 @@ %td{class: (f.object.errors[field.name].present? ? 'fieldWithErrors' : nil)} - if field.hint.present? = image_tag "info_tiny.png", title: field.hint, class: "tooltip-icon" - - if field.as == 'check_boxes' - - value = f.object.send(field.name) - - checked = YAML.load(value.to_s) .label.top{class: (field.required? ? 'req': nil)} = "#{field.label}:" - = f.input_field field.name, field.input_options.merge(checked: checked) + = f.input_field field.name, field.input_options - if i == 0 %td= spacer From d51d9f3ac6afeed62e8ff802d2f7147009b58d47 Mon Sep 17 00:00:00 2001 From: Stanley Date: Tue, 30 Jul 2024 16:51:12 +0800 Subject: [PATCH 090/117] Add instruction to restart server for checkbox list, update views New checkbox list need serialization thus restarting the server is required. --- app/views/admin/custom_fields/_check_boxes_field.html.haml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/admin/custom_fields/_check_boxes_field.html.haml b/app/views/admin/custom_fields/_check_boxes_field.html.haml index 373effb9d..927cf76be 100644 --- a/app/views/admin/custom_fields/_check_boxes_field.html.haml +++ b/app/views/admin/custom_fields/_check_boxes_field.html.haml @@ -1,6 +1,9 @@ %div - .label.top.req + .label.top = "Select Options (pipe separated):" -= f.text_field :collection_string, class: 'field_collection_string', size: 78 += f.text_field :collection_string, class: 'field_collection_string', size: 78, placeholder: "Option 1|Option 2|Option 3" = render partial: 'admin/custom_fields/base_field', locals: {f: f} + +- if f.object.new_record? + .info2 After saving, you must restart all instances of the Rails server to apply column serialization. \ No newline at end of file From d4fc92d7292ad3e64b97a965faca71eda0756979 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 07:46:54 +0000 Subject: [PATCH 091/117] Bump mini_racer from 0.13.0 to 0.14.0 Bumps [mini_racer](https://github.com/discourse/mini_racer) from 0.13.0 to 0.14.0. - [Changelog](https://github.com/rubyjs/mini_racer/blob/main/CHANGELOG) - [Commits](https://github.com/discourse/mini_racer/compare/v0.13.0...v0.14.0) --- updated-dependencies: - dependency-name: mini_racer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c11f84d3e..29dbe8c58 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -230,8 +230,8 @@ GEM thor (>= 0.14, < 2.0) json (2.7.2) language_server-protocol (3.17.0.3) - libv8-node (22.5.1.0-arm64-darwin) - libv8-node (22.5.1.0-x86_64-linux) + libv8-node (18.19.0.0-arm64-darwin) + libv8-node (18.19.0.0-x86_64-linux) listen (3.8.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) @@ -250,8 +250,8 @@ GEM method_source (1.1.0) mini_magick (4.13.2) mini_mime (1.1.5) - mini_racer (0.13.0) - libv8-node (~> 22.5.1.0) + mini_racer (0.14.0) + libv8-node (~> 18.19.0.0) minitest (5.24.1) msgpack (1.7.2) nenv (0.3.0) From 50cd38c96389cbffdd6d41f6838c901bbfed4f02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 07:47:18 +0000 Subject: [PATCH 092/117] Bump capistrano-bundler from 2.1.0 to 2.1.1 Bumps [capistrano-bundler](https://github.com/capistrano/bundler) from 2.1.0 to 2.1.1. - [Release notes](https://github.com/capistrano/bundler/releases) - [Commits](https://github.com/capistrano/bundler/compare/v2.1.0...v2.1.1) --- updated-dependencies: - dependency-name: capistrano-bundler dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c11f84d3e..2f95a3693 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -124,7 +124,7 @@ GEM i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (2.1.0) + capistrano-bundler (2.1.1) capistrano (~> 3.1) capistrano-rails (1.6.3) capistrano (~> 3.1) From 1a150dfb337748f343dc4f62d5b7faa554978ed3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 07:21:13 +0000 Subject: [PATCH 093/117] Bump mini_racer from 0.14.0 to 0.14.1 Bumps [mini_racer](https://github.com/discourse/mini_racer) from 0.14.0 to 0.14.1. - [Changelog](https://github.com/rubyjs/mini_racer/blob/main/CHANGELOG) - [Commits](https://github.com/discourse/mini_racer/compare/v0.14.0...v0.14.1) --- updated-dependencies: - dependency-name: mini_racer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 61ff5d7fd..11815aed6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -250,7 +250,7 @@ GEM method_source (1.1.0) mini_magick (4.13.2) mini_mime (1.1.5) - mini_racer (0.14.0) + mini_racer (0.14.1) libv8-node (~> 18.19.0.0) minitest (5.24.1) msgpack (1.7.2) From e3a385b4277819a9b606fe89b324c8a4e39bac32 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 07:44:00 +0000 Subject: [PATCH 094/117] Bump premailer from 1.23.0 to 1.24.0 Bumps [premailer](https://github.com/premailer/premailer) from 1.23.0 to 1.24.0. - [Changelog](https://github.com/premailer/premailer/blob/master/CHANGELOG.md) - [Commits](https://github.com/premailer/premailer/compare/v1.23.0...v1.24.0) --- updated-dependencies: - dependency-name: premailer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 11815aed6..af952c175 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -99,8 +99,8 @@ GEM acts_as_list (1.2.2) activerecord (>= 6.1) activesupport (>= 6.1) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) airbrussh (1.5.2) sshkit (>= 1.6.1, != 1.7.0) ast (2.4.2) @@ -156,7 +156,7 @@ GEM country_select (9.0.0) countries (> 5.0, < 7.0) crass (1.0.6) - css_parser (1.16.0) + css_parser (1.17.1) addressable database_cleaner (2.0.2) database_cleaner-active_record (>= 2, < 3) @@ -287,7 +287,7 @@ GEM racc pg (1.5.7) popper_js (2.11.8) - premailer (1.23.0) + premailer (1.24.0) addressable css_parser (>= 1.12.0) htmlentities (>= 4.0.0) @@ -296,7 +296,7 @@ GEM method_source (~> 1.0) pry-rails (0.3.11) pry (>= 0.13.0) - public_suffix (5.0.4) + public_suffix (6.0.1) puma (6.4.2) nio4r (~> 2.0) racc (1.8.1) From 114074bfc117f186e65249f1902e96088c636c85 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2024 07:10:15 +0000 Subject: [PATCH 095/117] Bump rspec-rails from 6.1.3 to 6.1.4 Bumps [rspec-rails](https://github.com/rspec/rspec-rails) from 6.1.3 to 6.1.4. - [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md) - [Commits](https://github.com/rspec/rspec-rails/compare/v6.1.3...v6.1.4) --- updated-dependencies: - dependency-name: rspec-rails dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index af952c175..7020ad13a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -150,7 +150,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) countries (6.0.0) unaccent (~> 0.3) country_select (9.0.0) @@ -252,7 +252,7 @@ GEM mini_mime (1.1.5) mini_racer (0.14.1) libv8-node (~> 18.19.0.0) - minitest (5.24.1) + minitest (5.25.0) msgpack (1.7.2) nenv (0.3.0) net-imap (0.4.12) @@ -391,7 +391,7 @@ GEM rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (6.1.3) + rspec-rails (6.1.4) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) @@ -480,7 +480,7 @@ GEM will_paginate (4.0.1) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.16) + zeitwerk (2.6.17) zeus (0.16.0) method_source (>= 0.6.7) From 9ab7032db0f4ed9a6d34801b96a07ef05e0514f6 Mon Sep 17 00:00:00 2001 From: Stanley Date: Tue, 20 Aug 2024 18:13:40 +0800 Subject: [PATCH 096/117] Fix multiple custom field groups on new entity creation --- app/controllers/entities_controller.rb | 2 +- app/views/fields/group.js.erb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/entities_controller.rb b/app/controllers/entities_controller.rb index 69654e5bc..65c2c56a6 100755 --- a/app/controllers/entities_controller.rb +++ b/app/controllers/entities_controller.rb @@ -83,7 +83,7 @@ def versions #---------------------------------------------------------------------------- def field_group if @tag = Tag.find_by_name(params[:tag].strip) - if @field_group = FieldGroup.find_by_tag_id_and_klass_name(@tag.id, klass.to_s) + if @field_groups = FieldGroup.where(tag_id: @tag.id, klass_name: klass.to_s) @asset = klass.find_by_id(params[:asset_id]) || klass.new render('fields/group') && return end diff --git a/app/views/fields/group.js.erb b/app/views/fields/group.js.erb index 4ed076ee9..7ba5837b4 100644 --- a/app/views/fields/group.js.erb +++ b/app/views/fields/group.js.erb @@ -1,3 +1,5 @@ <%= simple_fields_for(@asset) do |f| %> - $('#field_groups').append('<%= j render(partial: 'fields/group', locals: {f: f, field_group: @field_group, fields: @field_group.fields}) %>') + <% @field_groups.each do |field_group| %> + $('#field_groups').append('<%= j render(partial: 'fields/group', locals: {f: f, field_group: field_group, fields: field_group.fields}) %>') + <% end %> <% end %> From 5477495a8ae1e84f575d2b505975970021e8b9c6 Mon Sep 17 00:00:00 2001 From: Stanley Date: Tue, 20 Aug 2024 18:09:31 +0800 Subject: [PATCH 097/117] Fix delete confirmation with new Rails syntax; Change default delete confirmation to "Are you sure" translation --- app/helpers/application_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 79999b63c..18d3faeb1 100755 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -115,13 +115,13 @@ def link_to_edit(record, options = {}) #---------------------------------------------------------------------------- def link_to_delete(record, options = {}) - confirm = options[:confirm] || nil + confirm = options[:confirm] || t(:confirm_delete, record.class.to_s.downcase) link_to(t(:delete) + "!", options[:url] || url_for(record), method: :delete, remote: true, - confirm: confirm) + data: { confirm: confirm}) end #---------------------------------------------------------------------------- From 7147ceaccb3248f19421c03e9ec18561879e2a9e Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Wed, 21 Aug 2024 10:46:30 +0800 Subject: [PATCH 098/117] Added missing space --- app/helpers/application_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 18d3faeb1..e871994a5 100755 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -121,7 +121,7 @@ def link_to_delete(record, options = {}) options[:url] || url_for(record), method: :delete, remote: true, - data: { confirm: confirm}) + data: { confirm: confirm }) end #---------------------------------------------------------------------------- From 370cdf13d4b93dc198cc36487cc1784d921e34ac Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Wed, 21 Aug 2024 11:04:09 +0800 Subject: [PATCH 099/117] Added ordering to ensure consistent layout. label can be identical, so use created_at as secondary ordering. --- app/controllers/entities_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/entities_controller.rb b/app/controllers/entities_controller.rb index 65c2c56a6..9b99392a3 100755 --- a/app/controllers/entities_controller.rb +++ b/app/controllers/entities_controller.rb @@ -83,7 +83,7 @@ def versions #---------------------------------------------------------------------------- def field_group if @tag = Tag.find_by_name(params[:tag].strip) - if @field_groups = FieldGroup.where(tag_id: @tag.id, klass_name: klass.to_s) + if @field_groups = FieldGroup.where(tag_id: @tag.id, klass_name: klass.to_s).order(:label, :created_at) @asset = klass.find_by_id(params[:asset_id]) || klass.new render('fields/group') && return end From 6757af8836d062e35739e5347f585898a20e3b8b Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Wed, 21 Aug 2024 11:56:40 +0800 Subject: [PATCH 100/117] Confirmed field_group is optional --- app/models/fields/field.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/fields/field.rb b/app/models/fields/field.rb index 4f333c343..8c6942d6e 100644 --- a/app/models/fields/field.rb +++ b/app/models/fields/field.rb @@ -34,7 +34,7 @@ class Field < ActiveRecord::Base serialize :collection, Array serialize :settings, HashWithIndifferentAccess - belongs_to :field_group, optional: true # TODO: Is this really optional? + belongs_to :field_group, optional: true scope :core_fields, -> { where(type: 'CoreField') } scope :custom_fields, -> { where("type != 'CoreField'") } From e34f98fff3eaca7e2c621257b3e8d77069093a6f Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Wed, 21 Aug 2024 11:57:03 +0800 Subject: [PATCH 101/117] Added newline to template --- app/views/admin/custom_fields/_check_boxes_field.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/custom_fields/_check_boxes_field.html.haml b/app/views/admin/custom_fields/_check_boxes_field.html.haml index 927cf76be..a835de519 100644 --- a/app/views/admin/custom_fields/_check_boxes_field.html.haml +++ b/app/views/admin/custom_fields/_check_boxes_field.html.haml @@ -6,4 +6,4 @@ = render partial: 'admin/custom_fields/base_field', locals: {f: f} - if f.object.new_record? - .info2 After saving, you must restart all instances of the Rails server to apply column serialization. \ No newline at end of file + .info2 After saving, you must restart all instances of the Rails server to apply column serialization. From 35b4456062ee4c72959aa25021b54f1cf98f63a2 Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Wed, 21 Aug 2024 11:57:53 +0800 Subject: [PATCH 102/117] Rewrote spec to remove checkbox which is not a valid field type. Improved readability of specs --- spec/models/fields/field_spec.rb | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/spec/models/fields/field_spec.rb b/spec/models/fields/field_spec.rb index 16a2cd81d..6135b8e2c 100644 --- a/spec/models/fields/field_spec.rb +++ b/spec/models/fields/field_spec.rb @@ -49,21 +49,24 @@ expect(Field.new.input_options).to be_a(Hash) end - it "should be able to display a empty multi_select value" do - field = Field.new( - label: "Availability", - name: "availability" - ) - object = double('Object') + context "render" do + let(:field) { FactoryBot.create(:field, as: as) } + + context "check_boxes" do + let(:as) { "check_boxes" } + it { expect(field.render([1, 2, 3])).to eql("1, 2
3") } + it { expect(field.render([1, 2, 3])).to eql("1, 2
3") } + end - # as | value | expected - [["check_boxes", [1, 2, 3], "1, 2
3"], - %w[checkbox 0 no], - ["checkbox", 1, "yes"], - ["date", Time.parse('2011-04-19'), Time.parse('2011-04-19').strftime(I18n.t("date.formats.mmddyy"))]].each do |as, value, expected| - field.as = as - allow(object).to receive(field.name).and_return(value) - expect(field.render_value(object)).to eq(expected) + context "date" do + let(:as) { "date" } + it { expect(field.render(Time.parse('2011-04-19'))).to eql("Apr 19, 2011") } + end + + context "datetime" do + let(:as) { "datetime" } + it { expect(field.render(Time.parse('2011-04-19 14:47 +0000'))).to eql("19 Apr 2011 at 2:47PM") } end end + end From e27bf334b57485a448565b202c99ce01d70868bb Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Wed, 21 Aug 2024 13:13:49 +0800 Subject: [PATCH 103/117] Options are required for checkbox list --- app/views/admin/custom_fields/_check_boxes_field.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/custom_fields/_check_boxes_field.html.haml b/app/views/admin/custom_fields/_check_boxes_field.html.haml index a835de519..ee67d993c 100644 --- a/app/views/admin/custom_fields/_check_boxes_field.html.haml +++ b/app/views/admin/custom_fields/_check_boxes_field.html.haml @@ -1,5 +1,5 @@ %div - .label.top + .label.top.req = "Select Options (pipe separated):" = f.text_field :collection_string, class: 'field_collection_string', size: 78, placeholder: "Option 1|Option 2|Option 3" From fd4afdc9f2aae2ebb271e57f15c4f4c2cc4b38ed Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Wed, 21 Aug 2024 15:58:19 +0800 Subject: [PATCH 104/117] Address safe_constanize issues in rubocop. find_class uses a safe approach --- app/controllers/admin/fields_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/fields_controller.rb b/app/controllers/admin/fields_controller.rb index 35974bc88..71e4d9e6b 100644 --- a/app/controllers/admin/fields_controller.rb +++ b/app/controllers/admin/fields_controller.rb @@ -86,7 +86,7 @@ def sort field_ids = params["fields_field_group_#{field_group_id}"] || [] field_ids.each_with_index do |id, index| - Field.where(id:).update_all(position: index + 1, field_group_id:) + Field.where(id: id).update_all(position: index + 1, field_group_id: field_group_id) end render nothing: true @@ -101,8 +101,8 @@ def subform Field.find(id).tap { |f| f.as = as } else field_group_id = field[:field_group_id] - klass = Field.lookup_class(as).safe_constantize - klass.new(field_group_id:, as:) + klass = find_class(Field.lookup_class(as)) + klass.new(field_group_id: field_group_id, as: as) end respond_with(@field) do |format| From 8ac265f8c9af10914615682a94e26a4ffa869ee4 Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Wed, 21 Aug 2024 15:59:40 +0800 Subject: [PATCH 105/117] Register custom fields using explicit call to their class. This ensures they are 'seen' by ActiveRecord whe autoloading (usually in development mode) is turned on. --- lib/fat_free_crm/custom_fields.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/fat_free_crm/custom_fields.rb b/lib/fat_free_crm/custom_fields.rb index a5c330123..17413f3ff 100644 --- a/lib/fat_free_crm/custom_fields.rb +++ b/lib/fat_free_crm/custom_fields.rb @@ -9,6 +9,6 @@ # # Register CustomFields when Field class is loaded ActiveSupport.on_load(:fat_free_crm_field) do # self == Field - register(as: 'date_pair', klass: 'CustomFieldDatePair', type: 'date') - register(as: 'datetime_pair', klass: 'CustomFieldDatetimePair', type: 'timestamp') + CustomFieldDatePair.register(as: 'date_pair', klass: 'CustomFieldDatePair', type: 'date') + CustomFieldDatetimePair.register(as: 'datetime_pair', klass: 'CustomFieldDatetimePair', type: 'timestamp') end From ca9f6d7b174e5c88ef3469234aa9324615df01f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 07:48:16 +0000 Subject: [PATCH 106/117] Bump premailer from 1.24.0 to 1.25.0 Bumps [premailer](https://github.com/premailer/premailer) from 1.24.0 to 1.25.0. - [Changelog](https://github.com/premailer/premailer/blob/master/CHANGELOG.md) - [Commits](https://github.com/premailer/premailer/compare/v1.24.0...v1.25.0) --- updated-dependencies: - dependency-name: premailer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7020ad13a..53f6c1ec8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -287,7 +287,7 @@ GEM racc pg (1.5.7) popper_js (2.11.8) - premailer (1.24.0) + premailer (1.25.0) addressable css_parser (>= 1.12.0) htmlentities (>= 4.0.0) From 989eb485d09dc13ed9db7ccd76c51fea77a0274b Mon Sep 17 00:00:00 2001 From: Stanley Date: Thu, 22 Aug 2024 18:04:01 +0800 Subject: [PATCH 107/117] Fix Opportunities Campaign selection auto complete --- app/helpers/opportunities_helper.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/helpers/opportunities_helper.rb b/app/helpers/opportunities_helper.rb index 8ff2ba4e6..c73ec7670 100644 --- a/app/helpers/opportunities_helper.rb +++ b/app/helpers/opportunities_helper.rb @@ -42,7 +42,9 @@ def opportunity_campaign_select(options = {}) campaigns = ([selected_campaign] + Campaign.my(current_user).order(:name).limit(25)).compact.uniq collection_select :opportunity, :campaign_id, campaigns, :id, :name, { selected: options[:selected], prompt: t(:select_a_campaign) }, - style: 'width:330px;', class: 'select2' + style: 'width:330px;', class: 'select2', + placeholder: t(:select_a_campaign), + "data-url": auto_complete_campaigns_path(format: 'json') end # Generates the inline revenue message for the opportunity list table. From 70a4174d961f600c26610190677947f232c51643 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 20:49:47 +0000 Subject: [PATCH 108/117] Bump rexml from 3.3.3 to 3.3.6 Bumps [rexml](https://github.com/ruby/rexml) from 3.3.3 to 3.3.6. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.3.3...v3.3.6) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 53f6c1ec8..5fdc87e7f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -373,7 +373,7 @@ GEM responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.3.3) + rexml (3.3.6) strscan rspec (3.13.0) rspec-core (~> 3.13.0) From d64f1d8d0d8c6ccc07c3c776bb6b482a2ff13431 Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Fri, 23 Aug 2024 08:22:57 +0800 Subject: [PATCH 109/117] Fixed bug in CustomField where find_class was not finding newly registered custom_fields in development mode. Added strong params to custom fields. Improve specs. --- app/controllers/admin/fields_controller.rb | 12 ++-- app/models/fields/custom_field_pair.rb | 6 +- lib/fat_free_crm/custom_fields.rb | 5 +- .../admin/fields_controller_spec.rb | 37 ++++++++++ spec/models/fields/custom_field_pair_spec.rb | 72 +++++++++---------- 5 files changed, 81 insertions(+), 51 deletions(-) create mode 100644 spec/controllers/admin/fields_controller_spec.rb diff --git a/app/controllers/admin/fields_controller.rb b/app/controllers/admin/fields_controller.rb index 71e4d9e6b..43ab05447 100644 --- a/app/controllers/admin/fields_controller.rb +++ b/app/controllers/admin/fields_controller.rb @@ -42,11 +42,11 @@ def edit #---------------------------------------------------------------------------- def create as = field_params["as"] + klass= Field.lookup_class(as).safe_constantize @field = if as.match?(/pair/) - CustomFieldPair.create_pair("pair" => pair_params, "field" => field_params).first + klass.create_pair("pair" => pair_params, "field" => field_params).first elsif as.present? - klass = find_class(Field.lookup_class(as)) klass.create(field_params) else Field.new(field_params).tap(&:valid?) @@ -101,7 +101,7 @@ def subform Field.find(id).tap { |f| f.as = as } else field_group_id = field[:field_group_id] - klass = find_class(Field.lookup_class(as)) + klass = Field.lookup_class(as).safe_constantize klass.new(field_group_id: field_group_id, as: as) end @@ -113,13 +113,11 @@ def subform protected def field_params - # Sets the +permitted+ attribute to +true+. This can be used to pass - # mass assignment. Returns +self+. - params.require(:field).permit! + params.require(:field).permit(:as, :collection_string, :disabled, :field_group_id, :hint, :label, :maxlength, :minlength, :name, :pair_id, :placeholder, :position, :required, :settings, :type) end def pair_params - params.require(:pair).permit! + params.require(:pair).permit("0": [:hint, :required, :disabled, :id], "1": [:hint, :required, :disabled, :id]) end def setup_current_tab diff --git a/app/models/fields/custom_field_pair.rb b/app/models/fields/custom_field_pair.rb index 2b419b243..d85f64e51 100644 --- a/app/models/fields/custom_field_pair.rb +++ b/app/models/fields/custom_field_pair.rb @@ -14,7 +14,7 @@ def self.create_pair(params) fields = params['field'] pair = params['pair'] base_params = fields.delete_if { |k, _v| !%w[field_group_id label as].include?(k) } - klass = ("custom_field_" + fields['as'].gsub('pair', '_pair')).classify.constantize + klass = Field.lookup_class(fields['as']).safe_constantize field1 = klass.create(base_params.merge(pair['0'])) field2 = klass.create(base_params.merge(pair['1']).merge('pair_id' => field1.id, 'required' => field1.required, 'disabled' => field1.disabled)) [field1, field2] @@ -33,10 +33,10 @@ def self.update_pair(params) [field1, field2] end - # Returns the field that this field is paired with + # Returns the field that this field is paired with (bi-directional) #------------------------------------------------------------------------------ def paired_with - pair + pair || self.class.find_by_id(pair_id) end ActiveSupport.run_load_hooks(:fat_free_crm_custom_field_pair, self) diff --git a/lib/fat_free_crm/custom_fields.rb b/lib/fat_free_crm/custom_fields.rb index 17413f3ff..dbab455ac 100644 --- a/lib/fat_free_crm/custom_fields.rb +++ b/lib/fat_free_crm/custom_fields.rb @@ -8,7 +8,8 @@ # # Register CustomFields when Field class is loaded + ActiveSupport.on_load(:fat_free_crm_field) do # self == Field - CustomFieldDatePair.register(as: 'date_pair', klass: 'CustomFieldDatePair', type: 'date') - CustomFieldDatetimePair.register(as: 'datetime_pair', klass: 'CustomFieldDatetimePair', type: 'timestamp') + register(as: 'date_pair', klass: 'CustomFieldDatePair', type: 'date') + register(as: 'datetime_pair', klass: 'CustomFieldDatetimePair', type: 'timestamp') end diff --git a/spec/controllers/admin/fields_controller_spec.rb b/spec/controllers/admin/fields_controller_spec.rb new file mode 100644 index 000000000..543d885bd --- /dev/null +++ b/spec/controllers/admin/fields_controller_spec.rb @@ -0,0 +1,37 @@ +# frozen_string_literal: true + +# Copyright (c) 2008-2013 Michael Dvorkin and contributors. +# +# Fat Free CRM is freely distributable under the terms of MIT license. +# See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php +#------------------------------------------------------------------------------ +require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper') + +describe Admin::FieldsController do + + before(:each) do + login_admin + set_current_tab(:fields) + end + + let(:field_group) { FactoryBot.create(:field_group) } + + describe "create" do + it "should create a new custom field" do + post :create, params: { field: { as: "email", label: "Email", field_group_id: field_group.id } }, xhr: true + expect(assigns[:field].class).to eq(CustomField) + expect(assigns[:field].valid?).to eq(true) + expect(assigns[:field].label).to eq("Email") + expect(response).to render_template("admin/fields/create") + end + + it "should create a new custom field pair" do + post :create, params: { field: { as: "date_pair", label: "Date Pair", field_group_id: field_group.id }, pair: {"0" => {hint: "Hint"}, "1" => {hint: "Hint"}} }, xhr: true + expect(assigns[:field].class).to eq(CustomFieldDatePair) + expect(assigns[:field].valid?).to eq(true) + expect(assigns[:field].label).to eq("Date Pair") + expect(response).to render_template("admin/fields/create") + end + end + +end diff --git a/spec/models/fields/custom_field_pair_spec.rb b/spec/models/fields/custom_field_pair_spec.rb index d3c46a5da..438748568 100644 --- a/spec/models/fields/custom_field_pair_spec.rb +++ b/spec/models/fields/custom_field_pair_spec.rb @@ -8,69 +8,63 @@ require 'spec_helper' describe CustomFieldPair do - class CustomFieldFooPair - end + let(:field_group) { FactoryBot.create(:field_group) } it "should respond to pair" do expect(CustomFieldPair.new).to respond_to(:pair) end describe "create_pair" do - before(:each) do - @field = { 'as' => 'foopair', 'field_group_id' => 1, 'label' => 'Event' } - @pair1 = { 'name' => 'pair1' } - @pair2 = { 'name' => 'pair2' } - @params = { 'field' => @field, 'pair' => { '0' => @pair1, '1' => @pair2 } } - end + let(:field_params) { { "as" => "date_pair", "field_group_id" => field_group.id, "label" => "New Field Pair" } } + let(:pair_params) { { "0" => { "required" => "1" }, "1" => {} } } + let(:params) { { "pair" => pair_params, "field" => field_params } } it "should create the pair" do - params1 = @field.merge(@pair1) - foo1 = double(id: 3, required: true, disabled: 'false') - expect(CustomFieldFooPair).to receive(:create).with(params1).and_return(foo1) - params2 = @field.merge(@pair2).merge('pair_id' => 3, 'required' => true, 'disabled' => 'false') - foo2 = double(id: 5) - expect(CustomFieldFooPair).to receive(:create).with(params2).and_return(foo2) - - expect(CustomFieldPair.create_pair(@params)).to eq([foo1, foo2]) + field1, field2 = CustomFieldPair.create_pair(params) + expect(field1.label).to eq("New Field Pair") + expect(field1.as).to eq("date_pair") + expect(field1.field_group_id).to eq(field_group.id) + expect(field2.label).to eq("New Field Pair") + expect(field2.as).to eq("date_pair") + expect(field2.paired_with).to eq(field1) end end describe "update_pair" do - before(:each) do - @field = { 'as' => 'foopair', 'field_group_id' => 1, 'label' => 'Event' } - @pair1 = { 'name' => 'pair1' } - @pair2 = { 'name' => 'pair2' } - @params = { 'id' => '3', 'field' => @field, 'pair' => { '0' => @pair1, '1' => @pair2 } } - end + let!(:field1) { CustomFieldPair.create!(name: 'cf_pair1', label: 'Date Pair', as: 'date_pair', hint: "", field_group: field_group, required: false, disabled: 'false') } + let!(:field2) { CustomFieldPair.create!(name: 'cf_pair2', label: 'Date Pair', as: 'date_pair', hint: "", field_group: field_group, required: false, disabled: 'false', pair_id: field1.id) } + + let(:field_params) { { "label" => "Test Update" } } + let(:pair_params) { { "0" => { "required" => "1", "id" => field1.id }, "1" => {} } } + let(:params) { { "pair" => pair_params, "field" => field_params } } it "should update the pair" do - foo1 = double(required: true, disabled: 'false') - expect(foo1).to receive(:update).with(@field.merge(@pair1)) - foo2 = double - expect(foo2).to receive(:update).with(@field.merge(@pair2).merge('required' => true, 'disabled' => 'false')) - expect(foo1).to receive(:paired_with).and_return(foo2) - expect(CustomFieldPair).to receive(:find).with('3').and_return(foo1) + expect(field1.label).to eq("Date Pair") + expect(field2.label).to eq("Date Pair") + expect(field1.required).to eq(false) + expect(field2.required).to eq(false) + + CustomFieldPair.update_pair(params) + field1.reload + field2.reload - expect(CustomFieldPair.update_pair(@params)).to eq([foo1, foo2]) + expect(field1.label).to eq("Test Update") + expect(field2.label).to eq("Test Update") + expect(field1.required).to eq(true) + expect(field2.required).to eq(true) end end describe "paired_with" do - before(:each) do - @field1 = CustomFieldDatePair.new(name: 'cf_event_from') - @field2 = CustomFieldDatePair.new(name: 'cf_event_to') - end + let!(:field1) { CustomFieldPair.create!(name: 'cf_event_from', label: 'From', as: 'date_pair', field_group: field_group) } + let!(:field2) { CustomFieldPair.create!(name: 'cf_event_to', label: 'To', as: 'date_pair', field_group: field_group, pair_id: field1.id) } it "should return the 2nd field" do - expect(@field1).to receive(:pair).and_return(@field2) - expect(@field1.paired_with).to eq(@field2) + expect(field1.paired_with).to eq(field2) end it "should return the 1st field" do - expect(@field2).to receive(:pair).and_return(nil) - expect(@field2).to receive(:id).and_return(1) - expect(CustomFieldPair).to receive(:where).with(pair_id: 1).and_return([@field1]) - expect(@field2.paired_with).to eq(@field1) + expect(field2.paired_with).to eq(field1) end end end From 339b9b929f0f9226fe4b9bfb228a41c4f876c46e Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Fri, 23 Aug 2024 11:42:37 +0800 Subject: [PATCH 110/117] Fixed broken 'clear' button on Select2 Campaign select widget. --- app/helpers/opportunities_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/opportunities_helper.rb b/app/helpers/opportunities_helper.rb index c73ec7670..9717dc171 100644 --- a/app/helpers/opportunities_helper.rb +++ b/app/helpers/opportunities_helper.rb @@ -41,7 +41,7 @@ def opportunity_campaign_select(options = {}) selected_campaign = Campaign.find_by_id(options[:selected]) campaigns = ([selected_campaign] + Campaign.my(current_user).order(:name).limit(25)).compact.uniq collection_select :opportunity, :campaign_id, campaigns, :id, :name, - { selected: options[:selected], prompt: t(:select_a_campaign) }, + { selected: options[:selected], prompt: t(:select_a_campaign), include_blank: true }, style: 'width:330px;', class: 'select2', placeholder: t(:select_a_campaign), "data-url": auto_complete_campaigns_path(format: 'json') From 868e4427b097ff472cc83d4919090c75493572ea Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Fri, 23 Aug 2024 11:45:36 +0800 Subject: [PATCH 111/117] Remove unnecessary 'x' on Select2 assigned users widget. Select 'unassigned' instead. --- app/helpers/users_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 9079042be..bac8d485a 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -25,7 +25,7 @@ def user_select(asset, users, myself) user_options = user_options_for_select(users, myself) select(asset, :assigned_to, user_options, { include_blank: t(:unassigned) }, - style: 'width: 160px;', + style: 'width: 160px;', "data-allow-clear" => false, class: 'select2') end From 78f2e5166dae8b568af62c2c32678bbd2305677e Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Fri, 23 Aug 2024 14:55:04 +0800 Subject: [PATCH 112/117] Deleting a campaign shouldn't delete related leads and opportunities. --- app/models/entities/campaign.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/entities/campaign.rb b/app/models/entities/campaign.rb index e459762ff..e6329cbc0 100644 --- a/app/models/entities/campaign.rb +++ b/app/models/entities/campaign.rb @@ -35,8 +35,8 @@ class Campaign < ActiveRecord::Base belongs_to :user, optional: true # TODO: Is this really optional? belongs_to :assignee, class_name: "User", foreign_key: :assigned_to, optional: true # TODO: Is this really optional? has_many :tasks, as: :asset, dependent: :destroy # , :order => 'created_at DESC' - has_many :leads, -> { order "id DESC" }, dependent: :destroy - has_many :opportunities, -> { order "id DESC" }, dependent: :destroy + has_many :leads, -> { order "id DESC" } + has_many :opportunities, -> { order "id DESC" } has_many :emails, as: :mediator serialize :subscribed_users, Array From 60140f854c38f4edc8b2b89b32c58783a7686c84 Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Fri, 23 Aug 2024 15:32:12 +0800 Subject: [PATCH 113/117] settings attributes are unknown at runtime so must be arbitarily whitelisted. --- app/controllers/admin/fields_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/fields_controller.rb b/app/controllers/admin/fields_controller.rb index 43ab05447..917da1834 100644 --- a/app/controllers/admin/fields_controller.rb +++ b/app/controllers/admin/fields_controller.rb @@ -113,7 +113,7 @@ def subform protected def field_params - params.require(:field).permit(:as, :collection_string, :disabled, :field_group_id, :hint, :label, :maxlength, :minlength, :name, :pair_id, :placeholder, :position, :required, :settings, :type) + params.require(:field).permit(:as, :collection_string, :disabled, :field_group_id, :hint, :label, :maxlength, :minlength, :name, :pair_id, :placeholder, :position, :required, :type, settings: {}) end def pair_params From 5c2f839ba36a787dcda88fa5fe993613c4086533 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 07:33:05 +0000 Subject: [PATCH 114/117] Bump brakeman from 6.1.2 to 6.2.1 Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 6.1.2 to 6.2.1. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v6.1.2...v6.2.1) --- updated-dependencies: - dependency-name: brakeman dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5fdc87e7f..26fa8804c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -114,7 +114,7 @@ GEM autoprefixer-rails (>= 9.1.0) popper_js (>= 2.9.2, < 3) sassc-rails (>= 2.0.0) - brakeman (6.1.2) + brakeman (6.2.1) racc builder (3.3.0) byebug (11.1.3) From 21d807f7f35cc71b7c106cc346f378c107ba2c64 Mon Sep 17 00:00:00 2001 From: Stephen Kenworthy Date: Sat, 24 Aug 2024 11:40:55 +0800 Subject: [PATCH 115/117] Added a placeholder to ensure the 'x' button works on Select2 dropdown --- app/views/accounts/_top_section.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/accounts/_top_section.html.haml b/app/views/accounts/_top_section.html.haml index 50fae5801..908d69281 100755 --- a/app/views/accounts/_top_section.html.haml +++ b/app/views/accounts/_top_section.html.haml @@ -12,7 +12,7 @@ %td= spacer %td .label #{t :category}: - = f.select :category, Setting.unroll(:account_category), { selected: (@account.category || "other").to_sym, include_blank: t(:other) }, { style: "width:160px", class: 'select2' } + = f.select :category, Setting.unroll(:account_category), { selected: (@account.category || "other").to_sym, include_blank: t(:other) }, { style: "width:160px", class: 'select2', placeholder: t(:other) } %td= spacer %td .label #{t :rating}: From 63f122fa25ccab8a942cfc79b2301ecf81f7cc73 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 07:54:46 +0000 Subject: [PATCH 116/117] Bump acts-as-taggable-on from 10.0.0 to 11.0.0 Bumps [acts-as-taggable-on](https://github.com/mbleigh/acts-as-taggable-on) from 10.0.0 to 11.0.0. - [Release notes](https://github.com/mbleigh/acts-as-taggable-on/releases) - [Changelog](https://github.com/mbleigh/acts-as-taggable-on/blob/master/CHANGELOG.md) - [Commits](https://github.com/mbleigh/acts-as-taggable-on/compare/v10.0.0...v11.0.0) --- updated-dependencies: - dependency-name: acts-as-taggable-on dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 26fa8804c..6b747d369 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -94,8 +94,9 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - acts-as-taggable-on (10.0.0) - activerecord (>= 6.1, < 7.2) + acts-as-taggable-on (11.0.0) + activerecord (>= 7.0, < 8.0) + zeitwerk (>= 2.4, < 3.0) acts_as_list (1.2.2) activerecord (>= 6.1) activesupport (>= 6.1) @@ -252,7 +253,7 @@ GEM mini_mime (1.1.5) mini_racer (0.14.1) libv8-node (~> 18.19.0.0) - minitest (5.25.0) + minitest (5.25.1) msgpack (1.7.2) nenv (0.3.0) net-imap (0.4.12) From efcfa36819d17c0f1e579a25a628a14fe55dc9ce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 07:56:11 +0000 Subject: [PATCH 117/117] Bump premailer from 1.25.0 to 1.26.0 Bumps [premailer](https://github.com/premailer/premailer) from 1.25.0 to 1.26.0. - [Changelog](https://github.com/premailer/premailer/blob/master/CHANGELOG.md) - [Commits](https://github.com/premailer/premailer/compare/v1.25.0...v1.26.0) --- updated-dependencies: - dependency-name: premailer dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 26fa8804c..318f28ae2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -156,7 +156,7 @@ GEM country_select (9.0.0) countries (> 5.0, < 7.0) crass (1.0.6) - css_parser (1.17.1) + css_parser (1.19.0) addressable database_cleaner (2.0.2) database_cleaner-active_record (>= 2, < 3) @@ -287,9 +287,9 @@ GEM racc pg (1.5.7) popper_js (2.11.8) - premailer (1.25.0) + premailer (1.26.0) addressable - css_parser (>= 1.12.0) + css_parser (>= 1.19.0) htmlentities (>= 4.0.0) pry (0.14.2) coderay (~> 1.1)