Merge branch 'master' into tailwind-redesign

This commit is contained in:
Andrew Brown 2023-02-09 17:04:06 -08:00
commit fa997fcc98
3 changed files with 7 additions and 7 deletions

View File

@ -1 +1 @@
2.7.6
2.7.7

10
Gemfile
View File

@ -1,7 +1,7 @@
source 'https://rubygems.org'
ruby "~> 2.7"
# Server
# Server core
gem 'rails'
gem 'puma', '~> 5.6'
gem 'puma-heroku'
@ -14,7 +14,7 @@ gem 'aws-sdk-s3'
gem 'filesize'
# Image processing
gem 'paperclip'
gem 'paperclip' # TODO: we want to migrate off this game to ActiveStorage
gem 'rmagick'
gem 'image_processing'
gem 'active_storage_validations'
@ -26,7 +26,7 @@ gem 'authority'
# Billing
gem 'stripe'
gem 'stripe_event'
gem 'paypal_client' # todo do we need this gem after all?
gem 'paypal_client' # TODO: audit whether this is still used
gem 'paypal-checkout-sdk'
# Design
@ -113,11 +113,11 @@ end
group :test, :production do
gem 'pg', '~> 1.4'
gem "mini_racer", "~> 0.6.3"
gem "mini_racer", "~> 0.6.3" # TODO: audit whether we can remove this
end
group :test do
gem 'codeclimate-test-reporter', require: false
gem 'codeclimate-test-reporter', require: false # TODO: remove this
gem 'database_cleaner'
gem 'selenium-webdriver'
end

View File

@ -35,7 +35,7 @@ ActiveRecord::Schema.define(version: 2022_12_02_003053) do
end
create_table "active_storage_variant_records", force: :cascade do |t|
t.bigint "blob_id", null: false
t.integer "blob_id", null: false
t.string "variation_digest", null: false
t.index ["blob_id", "variation_digest"], name: "index_active_storage_variant_records_uniqueness", unique: true
end