From 2f2ed4f6ece947c06f585d0fe200390d12d93d24 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 13:25:19 +0000 Subject: [PATCH 01/25] Bump stripe_event from 2.3.2 to 2.7.0 Bumps [stripe_event](https://github.com/integrallis/stripe_event) from 2.3.2 to 2.7.0. - [Release notes](https://github.com/integrallis/stripe_event/releases) - [Changelog](https://github.com/integrallis/stripe_event/blob/master/CHANGELOG.md) - [Commits](https://github.com/integrallis/stripe_event/compare/v2.3.2...v2.7.0) --- updated-dependencies: - dependency-name: stripe_event dependency-type: direct:production 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 d074b356..84cb71fc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1636,9 +1636,9 @@ GEM stackprof (0.2.21) statsd-ruby (1.5.0) stripe (5.55.0) - stripe_event (2.3.2) + stripe_event (2.7.0) activesupport (>= 3.1) - stripe (>= 2.8, < 6) + stripe (>= 2.8, < 9) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) terser (1.1.13) From c4714f9f7ab03459ab4e3f65c77c9330e532d10f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 13:39:47 +0000 Subject: [PATCH 02/25] Bump engtagger from 0.3.2 to 0.4.0 Bumps [engtagger](https://github.com/yohasebe/engtagger) from 0.3.2 to 0.4.0. - [Release notes](https://github.com/yohasebe/engtagger/releases) - [Commits](https://github.com/yohasebe/engtagger/compare/v0.3.2...v0.4.0) --- updated-dependencies: - dependency-name: engtagger 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 d074b356..3dcf2eb3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1328,7 +1328,7 @@ GEM docile (1.1.5) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - engtagger (0.3.2) + engtagger (0.4.0) lru_redux erubi (1.12.0) event_emitter (0.2.6) From a7285784ead09842ed2b68d2ea20fff2aaa3c051 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 13:18:29 +0000 Subject: [PATCH 03/25] Bump csv from 3.2.5 to 3.2.6 Bumps [csv](https://github.com/ruby/csv) from 3.2.5 to 3.2.6. - [Release notes](https://github.com/ruby/csv/releases) - [Changelog](https://github.com/ruby/csv/blob/master/NEWS.md) - [Commits](https://github.com/ruby/csv/compare/v3.2.5...v3.2.6) --- updated-dependencies: - dependency-name: csv 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 d074b356..43ee71ad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1296,7 +1296,7 @@ GEM concurrent-ruby (1.2.0) connection_pool (2.3.0) crass (1.0.6) - csv (3.2.5) + csv (3.2.6) d3-rails (5.9.2) railties (>= 3.1) database_cleaner (2.0.1) From 1e3c659e7963747bc42b315a56613b631dd45451 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Feb 2023 13:35:08 +0000 Subject: [PATCH 04/25] Bump acts_as_list from 1.0.4 to 1.1.0 Bumps [acts_as_list](https://github.com/brendon/acts_as_list) from 1.0.4 to 1.1.0. - [Release notes](https://github.com/brendon/acts_as_list/releases) - [Changelog](https://github.com/brendon/acts_as_list/blob/master/CHANGELOG.md) - [Commits](https://github.com/brendon/acts_as_list/compare/v1.0.4...v1.1.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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index d074b356..187b132d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -124,7 +124,7 @@ GEM minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - acts_as_list (1.0.4) + acts_as_list (1.1.0) activerecord (>= 4.2) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) From a989a9ac405e60b32ea6a1b7b8014d46a8cfd4dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 11:48:55 +0000 Subject: [PATCH 05/25] Bump rack from 2.2.6.2 to 2.2.6.4 Bumps [rack](https://github.com/rack/rack) from 2.2.6.2 to 2.2.6.4. - [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.6.2...v2.2.6.4) --- 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 d074b356..c3f29ee2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1515,7 +1515,7 @@ GEM pundit (2.2.0) activesupport (>= 3.0.0) racc (1.6.2) - rack (2.2.6.2) + rack (2.2.6.4) rack-mini-profiler (3.0.0) rack (>= 1.2.0) rack-proxy (0.7.6) From 88e29a0347f6179e40ced0a8bf05c7cb266ac6ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 13:06:06 +0000 Subject: [PATCH 06/25] Bump sidekiq from 6.5.5 to 7.0.8 Bumps [sidekiq](https://github.com/sidekiq/sidekiq) from 6.5.5 to 7.0.8. - [Release notes](https://github.com/sidekiq/sidekiq/releases) - [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md) - [Commits](https://github.com/sidekiq/sidekiq/compare/v6.5.5...v7.0.8) --- updated-dependencies: - dependency-name: sidekiq dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d074b356..ba983306 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1294,7 +1294,7 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.2.0) - connection_pool (2.3.0) + connection_pool (2.4.0) crass (1.0.6) csv (3.2.5) d3-rails (5.9.2) @@ -1515,7 +1515,7 @@ GEM pundit (2.2.0) activesupport (>= 3.0.0) racc (1.6.2) - rack (2.2.6.2) + rack (2.2.6.4) rack-mini-profiler (3.0.0) rack (>= 1.2.0) rack-proxy (0.7.6) @@ -1573,7 +1573,7 @@ GEM redcarpet (3.6.0) redis (5.0.5) redis-client (>= 0.9.0) - redis-client (0.10.0) + redis-client (0.14.1) connection_pool responders (3.0.1) actionpack (>= 5.0) @@ -1609,10 +1609,11 @@ GEM rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) semantic_range (3.0.0) - sidekiq (6.5.5) - connection_pool (>= 2.2.2) - rack (~> 2.0) - redis (>= 4.5.0) + sidekiq (7.0.8) + concurrent-ruby (< 2) + connection_pool (>= 2.3.0) + rack (>= 2.2.4) + redis-client (>= 0.11.0) simplecov (0.13.0) docile (~> 1.1.0) json (>= 1.8, < 3) From ab31bcf8b7798211ffb6367d12bafe89b1cea582 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Apr 2023 06:26:28 +0000 Subject: [PATCH 07/25] Bump nokogiri from 1.14.2 to 1.14.3 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.14.2 to 1.14.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.14.2...v1.14.3) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d074b356..f140dadc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1479,10 +1479,10 @@ GEM netrc (0.11.0) newrelic_rpm (8.16.0) nio4r (2.5.8) - nokogiri (1.14.2) + nokogiri (1.14.3) mini_portile2 (~> 2.8.0) racc (~> 1.4) - nokogiri (1.14.2-x86_64-linux) + nokogiri (1.14.3-x86_64-linux) racc (~> 1.4) opus-ruby (1.0.1) ffi From e43f03a3b22350d1675be9c00a25245af1cfe840 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Apr 2023 13:39:03 +0000 Subject: [PATCH 08/25] Bump aws-sdk-s3 from 1.114.0 to 1.120.1 Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.114.0 to 1.120.1. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) --- updated-dependencies: - dependency-name: aws-sdk-s3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d074b356..89ca0fb3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -133,7 +133,7 @@ GEM autoprefixer-rails (10.4.7.0) execjs (~> 2) aws-eventstream (1.2.0) - aws-partitions (1.619.0) + aws-partitions (1.746.0) aws-sdk (3.1.0) aws-sdk-resources (~> 3) aws-sdk-accessanalyzer (1.23.0) @@ -331,10 +331,10 @@ GEM aws-sdk-connectparticipant (1.14.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.132.0) + aws-sdk-core (3.171.0) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.525.0) - aws-sigv4 (~> 1.1) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) aws-sdk-costandusagereportservice (1.34.0) aws-sdk-core (~> 3, >= 3.120.0) @@ -594,8 +594,8 @@ GEM aws-sdk-kinesisvideosignalingchannels (1.13.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.58.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-kms (1.63.0) + aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) aws-sdk-lakeformation (1.17.0) aws-sdk-core (~> 3, >= 3.120.0) @@ -1102,8 +1102,8 @@ GEM aws-sdk-route53resolver (1.30.0) aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.114.0) - aws-sdk-core (~> 3, >= 3.127.0) + aws-sdk-s3 (1.120.1) + aws-sdk-core (~> 3, >= 3.165.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sdk-s3control (1.40.0) @@ -1260,7 +1260,7 @@ GEM aws-sdk-core (~> 3, >= 3.120.0) aws-sigv4 (~> 1.1) aws-sigv2 (1.1.0) - aws-sigv4 (1.5.1) + aws-sigv4 (1.5.2) aws-eventstream (~> 1, >= 1.0.2) babel-source (5.8.35) babel-transpiler (0.7.0) @@ -1408,7 +1408,7 @@ GEM inline_svg (1.8.0) activesupport (>= 3.0) nokogiri (>= 1.6) - jmespath (1.6.1) + jmespath (1.6.2) json (2.5.1) jwt (2.2.3) kaminari (1.2.2) From 95e4b6551b1548ce69ad9eec11a7fe52c72a2c40 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Fri, 14 Apr 2023 11:03:46 -0700 Subject: [PATCH 09/25] show basil notice until it's dismissed or we replace it --- .../notice_dismissal/messages/_20.html.erb | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/app/views/notice_dismissal/messages/_20.html.erb b/app/views/notice_dismissal/messages/_20.html.erb index a1c593ee..90c2eb92 100644 --- a/app/views/notice_dismissal/messages/_20.html.erb +++ b/app/views/notice_dismissal/messages/_20.html.erb @@ -1,20 +1,18 @@ -<% if Date.current <= 'April 15, 2023'.to_date %> -
-
- See what's new -
- <%= link_to basil_path do %> -
-
- camera -
- Bring your notebook pages to life with our new image generator -
+
+
+ See what's new +
+ <%= link_to basil_path do %> +
+
+ camera +
+ Bring your notebook pages to life with our new image generator
- <% end %> -
- <%= link_to 'dismiss message', notice_dismissal_dismiss_path(notice_id: 20), class: 'right' %>
+ <% end %> +
+ <%= link_to 'dismiss message', notice_dismissal_dismiss_path(notice_id: 20), class: 'right' %>
-<% end %> \ No newline at end of file +
\ No newline at end of file From d346493b0f3159c8a19c70f7e4f732c65ab0a8bd Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Fri, 14 Apr 2023 12:00:50 -0700 Subject: [PATCH 10/25] Give all accounts 100 free images with Basil --- app/controllers/basil_controller.rb | 12 ++ app/models/basil_commission.rb | 2 + app/services/basil_service.rb | 2 + app/views/basil/content.html.erb | 27 +++-- app/views/basil/index.html.erb | 20 ++++ app/views/basil/review.html.erb | 110 ++++++++++-------- ..._deleted_at_column_to_basil_commissions.rb | 5 + db/schema.rb | 3 +- 8 files changed, 124 insertions(+), 57 deletions(-) create mode 100644 db/migrate/20230414183606_add_deleted_at_column_to_basil_commissions.rb diff --git a/app/controllers/basil_controller.rb b/app/controllers/basil_controller.rb index caf46b73..c866828e 100644 --- a/app/controllers/basil_controller.rb +++ b/app/controllers/basil_controller.rb @@ -16,6 +16,8 @@ class BasilController < ApplicationController @content = @current_user_content[@content_type].sort_by(&:name) end + + @generated_images_count = current_user.basil_commissions.with_deleted.count end def content @@ -199,6 +201,8 @@ class BasilController < ApplicationController .limit(10) .includes(:basil_feedbacks, :image_blob) @in_progress_commissions = @commissions.select { |c| c.completed_at.nil? } + @generated_images_count = current_user.basil_commissions.with_deleted.count + @can_request_another = @in_progress_commissions.count < 3 end @@ -404,9 +408,17 @@ class BasilController < ApplicationController def review @recent_commissions = BasilCommission.all.includes(:entity, :user).order('id DESC').limit(100) + + @commissions_per_user_id = BasilCommission.where('created_at > ?', 48.hours.ago).group(:user_id).order('count_all DESC').limit(5).count end def commission + @generated_images_count = current_user.basil_commissions.with_deleted.count + if @generated_images_count > BasilService::FREE_IMAGE_LIMIT + redirect_back fallback_location: basil_path, notice: "You've reached your free image limit. Please upgrade to generate more images." + return + end + # Fetch the related content @content = @current_user_content[commission_params.fetch(:entity_type)] .find { |c| c.id == commission_params.fetch(:entity_id).to_i } diff --git a/app/models/basil_commission.rb b/app/models/basil_commission.rb index 7b356993..cb6b08a6 100644 --- a/app/models/basil_commission.rb +++ b/app/models/basil_commission.rb @@ -1,4 +1,6 @@ class BasilCommission < ApplicationRecord + acts_as_paranoid + belongs_to :user belongs_to :entity, polymorphic: true diff --git a/app/services/basil_service.rb b/app/services/basil_service.rb index 402059e3..b8f7154b 100644 --- a/app/services/basil_service.rb +++ b/app/services/basil_service.rb @@ -1,4 +1,6 @@ class BasilService < Service + FREE_IMAGE_LIMIT = 100 + IGNORED_VALUES = ['', 'none', 'n/a', '.', '-', ' ', '?', '??', '???', 'x', nil] ENABLED_PAGE_TYPES = [ diff --git a/app/views/basil/content.html.erb b/app/views/basil/content.html.erb index 73d61aaa..3f20a92e 100644 --- a/app/views/basil/content.html.erb +++ b/app/views/basil/content.html.erb @@ -110,9 +110,7 @@ function commission_basil(style) {
<% end %>
- <% end %> - - <% if @can_request_another && @relevant_fields.any? %> + <% if BasilService.experimental_styles_for(@content.page_type).any? %>
Experimental styles
@@ -130,7 +128,7 @@ function commission_basil(style) { <% end %> <% end %> - <% if !@can_request_another %> + <% if !@can_request_another && @in_progress_commissions.any? %>
Basil is working on your <%= pluralize @in_progress_commissions.count, 'requested commission' %>.

@@ -138,13 +136,24 @@ function commission_basil(style) {
<% end %> - <% @commissions.each do |commission| %>
diff --git a/app/views/basil/index.html.erb b/app/views/basil/index.html.erb index 9bb19693..0593e263 100644 --- a/app/views/basil/index.html.erb +++ b/app/views/basil/index.html.erb @@ -38,6 +38,26 @@

+ + <% if true %> +
+ + Image generation is a Premium-only feature, but free accounts can still generate up + to <%= pluralize BasilService::FREE_IMAGE_LIMIT, 'image' %> for free. + +

+ You have generated <%= pluralize @generated_images_count, 'image' %> + and have <%= pluralize [0, BasilService::FREE_IMAGE_LIMIT - @generated_images_count].max, 'image' %> remaining: +
+
+
+ + <% if @generated_images_count > BasilService::FREE_IMAGE_LIMIT %> + <%= link_to 'Click here to manage your billing plan', subscription_path, class: 'blue-text text-darken-4' %> + <% end %> +
+ <% end %> + <% if @universe_scope %>
<%= Universe.icon %> diff --git a/app/views/basil/review.html.erb b/app/views/basil/review.html.erb index fb080c77..86c3278c 100644 --- a/app/views/basil/review.html.erb +++ b/app/views/basil/review.html.erb @@ -1,53 +1,69 @@ -<% @recent_commissions.each do |commission| %> -
- <% if commission.complete? %> - <%# image_tag commission.image, style: 'width: 100%' %> - <% - s3 = Aws::S3::Resource.new(region: "us-east-1") - obj = s3.bucket(commission.s3_bucket).object("job-#{commission.job_id}.png") - %> -
-
- <%= link_to obj.presigned_url(:get) do %> - <%= image_tag obj.presigned_url(:get) %> - <% end %> -
-
-
-
- <%= commission.id %>. - <% if commission.entity.present? %> - <%= link_to commission.entity.name, commission.entity %> +
+
+
+
Most-active creators over 48h
+
    + <% @commissions_per_user_id.each do |user_id, count| %> + <%# This is an N+1 query, but we can deal with it later %> + <% user = User.find(user_id.to_i) %> +
  1. <%= link_to user.display_name, user %>: <%= pluralize count, 'image' %>
    2. + <% end %> +
+
+
+ <% @recent_commissions.each do |commission| %> +
+ <% if commission.complete? %> + <%# image_tag commission.image, style: 'width: 100%' %> + <% + s3 = Aws::S3::Resource.new(region: "us-east-1") + obj = s3.bucket(commission.s3_bucket).object("job-#{commission.job_id}.png") + %> +
+
+ <%= link_to obj.presigned_url(:get) do %> + <%= image_tag obj.presigned_url(:get) %> <% end %> - <% if commission.style? %> - (<%= commission.style.humanize %>) - <% end %> - by <%= link_to commission.user.name, commission.user %> -
<%= commission.job_id %>
-
    -
  • - Completed <%= time_ago_in_words commission.completed_at %> ago -
    • -
  • - Took <%= distance_of_time_in_words commission.completed_at - commission.created_at %> -
    • -
    -
  • -
    Preprompt:
    - <%= commission.prompt.inspect %> -
    • -
+
+
+
+ <%= commission.id %>. + <% if commission.entity.present? %> + <%= link_to commission.entity.name, commission.entity %> + <% end %> + <% if commission.style? %> + (<%= commission.style.humanize %>) + <% end %> + by <%= link_to commission.user.name, commission.user %> +
<%= commission.job_id %>
+
+
    +
  • + Completed <%= time_ago_in_words commission.completed_at %> ago +
    • +
  • + Took <%= distance_of_time_in_words commission.completed_at - commission.created_at %> +
    • +
    +
  • +
    Preprompt:
    + <%= commission.prompt.inspect %> +
    • +
+
+
-
-
- <% else %> -
- Basil is still working on this commission... -
- (Requested <%= time_ago_in_words(commission.created_at) %> ago) -
+ <% else %> +
+ Basil is still working on this commission... +
+ (Requested <%= time_ago_in_words(commission.created_at) %> ago) +
+
+ <% end %>
<% end %> +
-<% end %> \ No newline at end of file +
diff --git a/db/migrate/20230414183606_add_deleted_at_column_to_basil_commissions.rb b/db/migrate/20230414183606_add_deleted_at_column_to_basil_commissions.rb new file mode 100644 index 00000000..91bf6604 --- /dev/null +++ b/db/migrate/20230414183606_add_deleted_at_column_to_basil_commissions.rb @@ -0,0 +1,5 @@ +class AddDeletedAtColumnToBasilCommissions < ActiveRecord::Migration[6.1] + def change + add_column :basil_commissions, :deleted_at, :datetime + end +end diff --git a/db/schema.rb b/db/schema.rb index d1adaaad..23c987c7 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2023_03_23_231640) do +ActiveRecord::Schema.define(version: 2023_04_14_183606) do create_table "active_storage_attachments", force: :cascade do |t| t.string "name", null: false @@ -200,6 +200,7 @@ ActiveRecord::Schema.define(version: 2023_03_23_231640) do t.float "cached_seconds_taken" t.string "s3_bucket", default: "basil-commissions" t.datetime "saved_at" + t.datetime "deleted_at" t.index ["entity_type", "entity_id", "saved_at"], name: "basil_commissions_ees" t.index ["entity_type", "entity_id", "style"], name: "basil_commissions_ees2" t.index ["entity_type", "entity_id"], name: "basil_commissions_ee" From f0a4013877e11ff782ec4210a1c5452c47dca4a6 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Fri, 14 Apr 2023 12:09:44 -0700 Subject: [PATCH 11/25] lil more review --- app/controllers/basil_controller.rb | 1 + app/views/basil/review.html.erb | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/app/controllers/basil_controller.rb b/app/controllers/basil_controller.rb index c866828e..c2ac93ea 100644 --- a/app/controllers/basil_controller.rb +++ b/app/controllers/basil_controller.rb @@ -410,6 +410,7 @@ class BasilController < ApplicationController @recent_commissions = BasilCommission.all.includes(:entity, :user).order('id DESC').limit(100) @commissions_per_user_id = BasilCommission.where('created_at > ?', 48.hours.ago).group(:user_id).order('count_all DESC').limit(5).count + @unique_users_generating_count = BasilCommission.where('created_at > ?', 48.hours.ago).group(:user_id).count end def commission diff --git a/app/views/basil/review.html.erb b/app/views/basil/review.html.erb index 86c3278c..1a5ac83d 100644 --- a/app/views/basil/review.html.erb +++ b/app/views/basil/review.html.erb @@ -9,6 +9,10 @@
  • <%= link_to user.display_name, user %>: <%= pluralize count, 'image' %>
    • <% end %> + +
    + <%= pluralize @unique_users_generating_count.count, 'unique user' %> over 48h +
    <% @recent_commissions.each do |commission| %> From 303334995e5ae40da47d9ca83c06db70dca69b23 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Fri, 14 Apr 2023 12:12:35 -0700 Subject: [PATCH 12/25] include deleted images in review counts --- app/controllers/basil_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/basil_controller.rb b/app/controllers/basil_controller.rb index c2ac93ea..d7127ff9 100644 --- a/app/controllers/basil_controller.rb +++ b/app/controllers/basil_controller.rb @@ -409,8 +409,8 @@ class BasilController < ApplicationController def review @recent_commissions = BasilCommission.all.includes(:entity, :user).order('id DESC').limit(100) - @commissions_per_user_id = BasilCommission.where('created_at > ?', 48.hours.ago).group(:user_id).order('count_all DESC').limit(5).count - @unique_users_generating_count = BasilCommission.where('created_at > ?', 48.hours.ago).group(:user_id).count + @commissions_per_user_id = BasilCommission.with_deleted.where('created_at > ?', 48.hours.ago).group(:user_id).order('count_all DESC').limit(5).count + @unique_users_generating_count = BasilCommission.with_deleted.where('created_at > ?', 48.hours.ago).group(:user_id).count end def commission From 4032d9e0505d701d200917b6b7d2f85a9c7c68ac Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Fri, 14 Apr 2023 13:26:49 -0700 Subject: [PATCH 13/25] visualize current queue --- app/controllers/basil_controller.rb | 12 ++++++++++-- app/services/basil_service.rb | 3 ++- app/views/basil/review.html.erb | 11 +++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/app/controllers/basil_controller.rb b/app/controllers/basil_controller.rb index d7127ff9..a6f3ee25 100644 --- a/app/controllers/basil_controller.rb +++ b/app/controllers/basil_controller.rb @@ -203,7 +203,7 @@ class BasilController < ApplicationController @in_progress_commissions = @commissions.select { |c| c.completed_at.nil? } @generated_images_count = current_user.basil_commissions.with_deleted.count - @can_request_another = @in_progress_commissions.count < 3 + @can_request_another = @in_progress_commissions.count < BasilService::MAX_JOB_QUEUE_SIZE end def character @@ -228,7 +228,7 @@ class BasilController < ApplicationController .limit(20) .includes(:basil_feedbacks) @in_progress_commissions = BasilCommission.where(entity_type: 'Character', entity_id: @character.id, completed_at: nil) - @can_request_another = @in_progress_commissions.count < 3 + @can_request_another = @in_progress_commissions.count < BasilService::MAX_JOB_QUEUE_SIZE end def about @@ -411,6 +411,8 @@ class BasilController < ApplicationController @commissions_per_user_id = BasilCommission.with_deleted.where('created_at > ?', 48.hours.ago).group(:user_id).order('count_all DESC').limit(5).count @unique_users_generating_count = BasilCommission.with_deleted.where('created_at > ?', 48.hours.ago).group(:user_id).count + + @current_queue_items = BasilCommission.where(completed_at: nil).order('created_at ASC') end def commission @@ -420,6 +422,12 @@ class BasilController < ApplicationController return end + current_queue_size = current_user.basil_commissions.where(completed_at: nil).count + if current_queue_size >= BasilService::MAX_JOB_QUEUE_SIZE + redirect_back fallback_location: basil_path, notice: "You can only have #{BasilService::MAX_JOB_QUEUE_SIZE} commissions in progress at a time. Please wait for one to complete before requesting another." + return + end + # Fetch the related content @content = @current_user_content[commission_params.fetch(:entity_type)] .find { |c| c.id == commission_params.fetch(:entity_id).to_i } diff --git a/app/services/basil_service.rb b/app/services/basil_service.rb index b8f7154b..86017259 100644 --- a/app/services/basil_service.rb +++ b/app/services/basil_service.rb @@ -1,5 +1,6 @@ class BasilService < Service - FREE_IMAGE_LIMIT = 100 + FREE_IMAGE_LIMIT = 100 + MAX_JOB_QUEUE_SIZE = 3 IGNORED_VALUES = ['', 'none', 'n/a', '.', '-', ' ', '?', '??', '???', 'x', nil] diff --git a/app/views/basil/review.html.erb b/app/views/basil/review.html.erb index 1a5ac83d..182c65f5 100644 --- a/app/views/basil/review.html.erb +++ b/app/views/basil/review.html.erb @@ -13,6 +13,17 @@
    <%= pluralize @unique_users_generating_count.count, 'unique user' %> over 48h
    + +

    +
    Queue
    +
      + <% @current_queue_items.each do |commission| %> +
    1. + <%= commission.entity_type %>-<%= commission.entity_id %> (<%= commission.style %>) + for U-<%= commission.user_id %> +
      2. + <% end %> +
    <% @recent_commissions.each do |commission| %> From 1dffd36ca2664ecc7164e06d0c609aff6f65ba0d Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Fri, 14 Apr 2023 13:35:55 -0700 Subject: [PATCH 14/25] don't forget this --- app/controllers/basil_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/basil_controller.rb b/app/controllers/basil_controller.rb index a6f3ee25..0140b520 100644 --- a/app/controllers/basil_controller.rb +++ b/app/controllers/basil_controller.rb @@ -203,7 +203,8 @@ class BasilController < ApplicationController @in_progress_commissions = @commissions.select { |c| c.completed_at.nil? } @generated_images_count = current_user.basil_commissions.with_deleted.count - @can_request_another = @in_progress_commissions.count < BasilService::MAX_JOB_QUEUE_SIZE + @can_request_another = current_user.on_premium_plan? || @generated_images_count < BasilService::FREE_IMAGE_LIMIT + @can_request_another = @can_request_another && @in_progress_commissions.count < BasilService::MAX_JOB_QUEUE_SIZE end def character From ff6b64c7c019895af145e06d04a3854f06d672a9 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Fri, 14 Apr 2023 13:36:55 -0700 Subject: [PATCH 15/25] clean up unused endpoint code --- app/controllers/basil_controller.rb | 25 ------------------------- config/routes.rb | 4 ---- 2 files changed, 29 deletions(-) diff --git a/app/controllers/basil_controller.rb b/app/controllers/basil_controller.rb index 0140b520..1c38817e 100644 --- a/app/controllers/basil_controller.rb +++ b/app/controllers/basil_controller.rb @@ -207,31 +207,6 @@ class BasilController < ApplicationController @can_request_another = @can_request_another && @in_progress_commissions.count < BasilService::MAX_JOB_QUEUE_SIZE end - def character - @character = current_user.characters.find(params[:id]) - @guidance = BasilFieldGuidance.find_or_initialize_by(entity: @character, user: current_user).try(:guidance) - @guidance ||= {} - - category_ids = AttributeCategory.where( - user_id: current_user.id, - entity_type: 'character', - label: ['Looks', 'Appearance'] - ).pluck(:id) - @appearance_fields = AttributeField.where(attribute_category_id: category_ids) - @attributes = Attribute.where( - attribute_field_id: @appearance_fields.pluck(:id), - entity_id: @character.id, - entity_type: 'Character' - ) - - @commissions = BasilCommission.where(entity_type: 'Character', entity_id: @character.id) - .order('id DESC') - .limit(20) - .includes(:basil_feedbacks) - @in_progress_commissions = BasilCommission.where(entity_type: 'Character', entity_id: @character.id, completed_at: nil) - @can_request_another = @in_progress_commissions.count < BasilService::MAX_JOB_QUEUE_SIZE - end - def about end diff --git a/config/routes.rb b/config/routes.rb index 969e828a..c8e55f52 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -24,10 +24,6 @@ Rails.application.routes.draw do get '/:content_type', to: 'basil#index', as: :basil_content_index get '/:content_type/:id', to: 'basil#content', as: :basil_content post '/:content_type/:id', to: 'basil#commission', as: :basil_commission - - # URLs to migrate over - # get '/character/:id', to: 'basil#character', as: :basil_character - # post '/character/:id', to: 'basil#commission' end end From df23175275f96450c3e376c11f2e22f35eb99037 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Sat, 15 Apr 2023 11:58:38 -0700 Subject: [PATCH 16/25] better basil stats --- app/controllers/basil_controller.rb | 37 ++++++++++++++++------------- app/views/basil/content.html.erb | 22 ++++++++--------- app/views/basil/index.html.erb | 6 ++--- 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/app/controllers/basil_controller.rb b/app/controllers/basil_controller.rb index 1c38817e..59b3d003 100644 --- a/app/controllers/basil_controller.rb +++ b/app/controllers/basil_controller.rb @@ -211,10 +211,10 @@ class BasilController < ApplicationController end def stats - @commissions = BasilCommission.all + @commissions = BasilCommission.all.with_deleted @queued = BasilCommission.where(completed_at: nil) - @completed = BasilCommission.where.not(completed_at: nil) + @completed = BasilCommission.where.not(completed_at: nil).with_deleted @average_wait_time = @completed.where('completed_at > ?', 24.hours.ago) .average(:cached_seconds_taken) @@ -275,14 +275,16 @@ class BasilController < ApplicationController 'painting2', 'painting3', 'anime' ].flatten.compact.uniq - @total_score_per_style = BasilCommission.where(style: active_styles) - .joins(:basil_feedbacks) - .group(:style) - .sum(:score_adjustment) - .map { |style, average| [style, average.round(1)] } - .sort_by(&:second) - .reverse - @average_score_per_style = BasilCommission.where(style: active_styles) + @total_score_per_style = BasilCommission.with_deleted + .where(style: active_styles) + .joins(:basil_feedbacks) + .group(:style) + .sum(:score_adjustment) + .map { |style, average| [style, average.round(1)] } + .sort_by(&:second) + .reverse + @average_score_per_style = BasilCommission.with_deleted + .where(style: active_styles) .joins(:basil_feedbacks) .group(:style) .average(:score_adjustment) @@ -290,7 +292,8 @@ class BasilController < ApplicationController .sort_by(&:second) .reverse - @average_score_per_page_type = BasilCommission.where.not(completed_at: nil) + @average_score_per_page_type = BasilCommission.with_deleted + .where.not(completed_at: nil) .joins(:basil_feedbacks) .group(:entity_type) .average(:score_adjustment) @@ -398,17 +401,17 @@ class BasilController < ApplicationController return end - current_queue_size = current_user.basil_commissions.where(completed_at: nil).count - if current_queue_size >= BasilService::MAX_JOB_QUEUE_SIZE - redirect_back fallback_location: basil_path, notice: "You can only have #{BasilService::MAX_JOB_QUEUE_SIZE} commissions in progress at a time. Please wait for one to complete before requesting another." - return - end - # Fetch the related content @content = @current_user_content[commission_params.fetch(:entity_type)] .find { |c| c.id == commission_params.fetch(:entity_id).to_i } return raise "Invalid content commission params" if @content.nil? + current_queue_size = current_user.basil_commissions.where(completed_at: nil).where(entity: @content).count + if current_queue_size >= BasilService::MAX_JOB_QUEUE_SIZE + redirect_back fallback_location: basil_path, notice: "You can only have #{BasilService::MAX_JOB_QUEUE_SIZE} commissions per page in progress at a time. Please wait for one to complete before requesting another." + return + end + # Before creating the prompt, do a little config to tweak things to work well :) labels_to_omit_label_text = [ "Name", diff --git a/app/views/basil/content.html.erb b/app/views/basil/content.html.erb index 3f20a92e..8cb5bd3f 100644 --- a/app/views/basil/content.html.erb +++ b/app/views/basil/content.html.erb @@ -128,15 +128,7 @@ function commission_basil(style) { <% end %> <% end %> - <% if !@can_request_another && @in_progress_commissions.any? %> -
    - Basil is working on your <%= pluralize @in_progress_commissions.count, 'requested commission' %>. -

    - As soon as he completes one, you'll be able to request another. -
    - <% end %> - - <% if !@can_request_another && @generated_images_count >= BasilService::FREE_IMAGE_LIMIT %> + <% unless current_user.on_premium_plan? %>
    Image generation is a Premium-only feature, but free accounts can still generate up @@ -144,17 +136,25 @@ function commission_basil(style) {

    You have generated <%= pluralize @generated_images_count, 'image' %> - and have <%= pluralize [0, BasilService::FREE_IMAGE_LIMIT - @generated_images_count].max, 'image' %> remaining: + and have <%= pluralize [0, BasilService::FREE_IMAGE_LIMIT - @generated_images_count].max, 'free image' %> remaining:
    - <% if @generated_images_count > BasilService::FREE_IMAGE_LIMIT %> + <% if @generated_images_count >= BasilService::FREE_IMAGE_LIMIT %> <%= link_to 'Click here to manage your billing plan', subscription_path, class: 'blue-text text-darken-4' %> <% end %>
    <% end %> + <% if !@can_request_another && @in_progress_commissions.any? %> +
    + Basil is working on your <%= pluralize @in_progress_commissions.count, 'requested commission' %>. +

    + As soon as he completes one, you'll be able to request another. +
    + <% end %> + <% @commissions.each do |commission| %>
    <% if commission.complete? %> diff --git a/app/views/basil/index.html.erb b/app/views/basil/index.html.erb index 0593e263..5e391e4c 100644 --- a/app/views/basil/index.html.erb +++ b/app/views/basil/index.html.erb @@ -39,7 +39,7 @@
    - <% if true %> + <% unless current_user.on_premium_plan? %>
    Image generation is a Premium-only feature, but free accounts can still generate up @@ -47,12 +47,12 @@

    You have generated <%= pluralize @generated_images_count, 'image' %> - and have <%= pluralize [0, BasilService::FREE_IMAGE_LIMIT - @generated_images_count].max, 'image' %> remaining: + and have <%= pluralize [0, BasilService::FREE_IMAGE_LIMIT - @generated_images_count].max, 'free image' %> remaining:
    - <% if @generated_images_count > BasilService::FREE_IMAGE_LIMIT %> + <% if @generated_images_count >= BasilService::FREE_IMAGE_LIMIT %> <%= link_to 'Click here to manage your billing plan', subscription_path, class: 'blue-text text-darken-4' %> <% end %>
    From 99edb8de46fa7f590f4873f8b5f420f2d9eb405f Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Sat, 15 Apr 2023 11:59:46 -0700 Subject: [PATCH 17/25] 500 fix for null state --- app/controllers/basil_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/basil_controller.rb b/app/controllers/basil_controller.rb index 59b3d003..a595b868 100644 --- a/app/controllers/basil_controller.rb +++ b/app/controllers/basil_controller.rb @@ -217,7 +217,7 @@ class BasilController < ApplicationController @completed = BasilCommission.where.not(completed_at: nil).with_deleted @average_wait_time = @completed.where('completed_at > ?', 24.hours.ago) - .average(:cached_seconds_taken) + .average(:cached_seconds_taken) || 0 @seconds_over_time = @completed.where('completed_at > ?', 24.hours.ago) .group_by { |c| ((c.cached_seconds_taken || 0) / 60).round } .map { |minutes, list| [minutes, list.count] } From 4a56bf8ba63ff385d050df26deecfb722389f38c Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Sat, 15 Apr 2023 12:48:36 -0700 Subject: [PATCH 18/25] quick 500 fix --- app/controllers/basil_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/basil_controller.rb b/app/controllers/basil_controller.rb index a595b868..8511f4df 100644 --- a/app/controllers/basil_controller.rb +++ b/app/controllers/basil_controller.rb @@ -14,7 +14,7 @@ class BasilController < ApplicationController return raise "Invalid content type: #{params[:content_type]}" end - @content = @current_user_content[@content_type].sort_by(&:name) + @content = @current_user_content.fetch(@content_type, []).sort_by(&:name) end @generated_images_count = current_user.basil_commissions.with_deleted.count From 1e497e9977cbc2f0944f886e55393c6cae46ca12 Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Mon, 17 Apr 2023 13:11:41 -0700 Subject: [PATCH 19/25] oops, bad guardrail --- app/controllers/basil_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/basil_controller.rb b/app/controllers/basil_controller.rb index 8511f4df..674e06e9 100644 --- a/app/controllers/basil_controller.rb +++ b/app/controllers/basil_controller.rb @@ -396,7 +396,7 @@ class BasilController < ApplicationController def commission @generated_images_count = current_user.basil_commissions.with_deleted.count - if @generated_images_count > BasilService::FREE_IMAGE_LIMIT + if !current_user.on_premium_plan? && @generated_images_count > BasilService::FREE_IMAGE_LIMIT redirect_back fallback_location: basil_path, notice: "You've reached your free image limit. Please upgrade to generate more images." return end From dfd5f4b9101cc4f9cdfc8f9bfeb6413095c08c9e Mon Sep 17 00:00:00 2001 From: Andrew Brown Date: Mon, 17 Apr 2023 13:34:08 -0700 Subject: [PATCH 20/25] Revert "Bump sidekiq from 6.5.5 to 7.0.8" This reverts commit 88e29a0347f6179e40ced0a8bf05c7cb266ac6ed. --- Gemfile.lock | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5009ef11..d5b2a5f4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1294,7 +1294,7 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.2.0) - connection_pool (2.4.0) + connection_pool (2.3.0) crass (1.0.6) csv (3.2.6) d3-rails (5.9.2) @@ -1515,7 +1515,7 @@ GEM pundit (2.2.0) activesupport (>= 3.0.0) racc (1.6.2) - rack (2.2.6.4) + rack (2.2.6.2) rack-mini-profiler (3.0.0) rack (>= 1.2.0) rack-proxy (0.7.6) @@ -1573,7 +1573,7 @@ GEM redcarpet (3.6.0) redis (5.0.5) redis-client (>= 0.9.0) - redis-client (0.14.1) + redis-client (0.10.0) connection_pool responders (3.0.1) actionpack (>= 5.0) @@ -1609,11 +1609,10 @@ GEM rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) semantic_range (3.0.0) - sidekiq (7.0.8) - concurrent-ruby (< 2) - connection_pool (>= 2.3.0) - rack (>= 2.2.4) - redis-client (>= 0.11.0) + sidekiq (6.5.5) + connection_pool (>= 2.2.2) + rack (~> 2.0) + redis (>= 4.5.0) simplecov (0.13.0) docile (~> 1.1.0) json (>= 1.8, < 3) From a59d0f8541a3a9a4c6d308e4a9ccc285bfec93c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 23:29:17 +0000 Subject: [PATCH 21/25] Bump stackprof from 0.2.21 to 0.2.25 Bumps [stackprof](https://github.com/tmm1/stackprof) from 0.2.21 to 0.2.25. - [Release notes](https://github.com/tmm1/stackprof/releases) - [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md) - [Commits](https://github.com/tmm1/stackprof/compare/v0.2.21...v0.2.25) --- updated-dependencies: - dependency-name: stackprof 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 d5b2a5f4..31bf1254 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1633,7 +1633,7 @@ GEM sqlite3 (1.6.0) mini_portile2 (~> 2.8.0) sqlite3 (1.6.0-x86_64-linux) - stackprof (0.2.21) + stackprof (0.2.25) statsd-ruby (1.5.0) stripe (5.55.0) stripe_event (2.7.0) From 96cb393964529cec650cd6e4d3f4709e072b239e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 23:29:21 +0000 Subject: [PATCH 22/25] Bump database_cleaner from 2.0.1 to 2.0.2 Bumps [database_cleaner](https://github.com/DatabaseCleaner/database_cleaner) from 2.0.1 to 2.0.2. - [Release notes](https://github.com/DatabaseCleaner/database_cleaner/releases) - [Changelog](https://github.com/DatabaseCleaner/database_cleaner/blob/main/History.rdoc) - [Commits](https://github.com/DatabaseCleaner/database_cleaner/compare/v2.0.1...v2.0.2) --- updated-dependencies: - dependency-name: database_cleaner dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d5b2a5f4..317be799 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1293,15 +1293,15 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.2.0) + concurrent-ruby (1.2.2) connection_pool (2.3.0) crass (1.0.6) csv (3.2.6) d3-rails (5.9.2) railties (>= 3.1) - database_cleaner (2.0.1) - database_cleaner-active_record (~> 2.0.0) - database_cleaner-active_record (2.0.1) + database_cleaner (2.0.2) + database_cleaner-active_record (>= 2, < 3) + database_cleaner-active_record (2.1.0) activerecord (>= 5.a) database_cleaner-core (~> 2.0.0) database_cleaner-core (2.0.1) @@ -1462,7 +1462,7 @@ GEM mini_portile2 (2.8.1) mini_racer (0.6.3) libv8-node (~> 16.10.0.0) - minitest (5.17.0) + minitest (5.18.0) multi_json (1.15.0) multipart-post (2.3.0) mustache (1.1.1) From a7dbdb2522b32231c188dedb7b2ec9e1b1a09188 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 23:50:55 +0000 Subject: [PATCH 23/25] Bump newrelic_rpm from 8.16.0 to 9.2.0 Bumps [newrelic_rpm](https://github.com/newrelic/newrelic-ruby-agent) from 8.16.0 to 9.2.0. - [Release notes](https://github.com/newrelic/newrelic-ruby-agent/releases) - [Changelog](https://github.com/newrelic/newrelic-ruby-agent/blob/dev/CHANGELOG.md) - [Commits](https://github.com/newrelic/newrelic-ruby-agent/compare/8.16.0...9.2.0) --- updated-dependencies: - dependency-name: newrelic_rpm dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 317be799..351e729b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1477,7 +1477,7 @@ GEM net-smtp (0.3.3) net-protocol netrc (0.11.0) - newrelic_rpm (8.16.0) + newrelic_rpm (9.2.0) nio4r (2.5.8) nokogiri (1.14.3) mini_portile2 (~> 2.8.0) From 241ee09ee15fa3eacf1629c36fe6c02759d6fdbd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 23:50:56 +0000 Subject: [PATCH 24/25] Bump rack-mini-profiler from 3.0.0 to 3.1.0 Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases) - [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md) - [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v3.0.0...v3.1.0) --- updated-dependencies: - dependency-name: rack-mini-profiler 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 317be799..3b8180ce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1515,8 +1515,8 @@ GEM pundit (2.2.0) activesupport (>= 3.0.0) racc (1.6.2) - rack (2.2.6.2) - rack-mini-profiler (3.0.0) + rack (2.2.6.4) + rack-mini-profiler (3.1.0) rack (>= 1.2.0) rack-proxy (0.7.6) rack From 5a3448883cc1856ac09935af31c787212745160e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 23:50:56 +0000 Subject: [PATCH 25/25] Bump rmagick from 5.1.0 to 5.2.0 Bumps [rmagick](https://github.com/rmagick/rmagick) from 5.1.0 to 5.2.0. - [Release notes](https://github.com/rmagick/rmagick/releases) - [Changelog](https://github.com/rmagick/rmagick/blob/main/CHANGELOG.md) - [Commits](https://github.com/rmagick/rmagick/commits) --- updated-dependencies: - dependency-name: rmagick 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 317be799..47195756 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1585,7 +1585,7 @@ GEM netrc (~> 0.8) rexml (3.2.5) rinku (2.0.6) - rmagick (5.1.0) + rmagick (5.2.0) pkg-config (~> 1.4) ruby-vips (2.1.4) ffi (~> 1.12)