Upgrade to Rails 7.0.8 (pupilfirst#1439)

Co-authored-by: Kaiser Sakhi <[email protected]>
Co-authored-by: Hari Gopal <[email protected]>

.devcontainer/Dockerfile

@@ -19,7 +19,7 @@ RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSI
 
 # [Optional] Uncomment this section to install additional OS packages.
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends imagemagick autoconf libtool nginx
+    && apt-get -y install --no-install-recommends libvips autoconf libtool nginx
 
 # [Optional] Uncomment this line to install additional gems.
 # RUN gem install <your-gem-names-here>

.gitattributes

@@ -1,2 +1,10 @@
+# See https://git-scm.com/docs/gitattributes for more about git attribute files.
+
+# Mark the database schema as having been generated.
+db/schema.rb linguist-generated
+
+# Mark any vendored files as having been vendored.
+vendor/* linguist-vendored
+
 /.yarn/releases/** binary
 /.yarn/plugins/** binary

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ on:
       - "docs/**"
 env:
   PF_IMAGE_NAME: pupilfirst
-  PF_VERSION: "2023.5"
+  PF_VERSION: "2023.6"
   YARN_CHECKSUM_BEHAVIOR: ignore
 jobs:
   tests:
@@ -49,8 +49,14 @@ jobs:
       RECAPTCHA_V3_SECRET_KEY: ignored
       RECAPTCHA_V2_SITE_KEY: ignored
       RECAPTCHA_V2_SECRET_KEY: ignored
+      POSTMARK_HOOK_ID: hook_id_for_test
+      POSTMARK_HOOK_SECRET: hook_secret_for_test
 
     steps:
+      - name: Install libvips
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libvips
       - uses: actions/checkout@v2
       - name: Use Ruby 3.2
         uses: ruby/setup-ruby@v1

.gitignore

@@ -15,6 +15,9 @@
 # Ignore uploaded files in development.
 /storage/*
 !/storage/.keep
+/tmp/storage/*
+!/tmp/storage/
+!/tmp/storage/.keep
 
 /public/assets
 /public/uploads

.rubocop.yml

@@ -21,7 +21,9 @@ Rails/Date:
 Rails/HasAndBelongsToMany:
   Enabled: false # This disallows HABTM.
 Rails/I18nLocaleTexts:
-  Enabled: false # This should be enabled when #933 is merged.
+  Enabled: false # This should be enabled when #933 is merged
+Rails/FindEach:
+  Enabled: false # Blanket find_each isn't a good idea
 
 # Project styling
 

.yarnrc.yml

@@ -1,10 +1,13 @@
-nodeLinker: node-modules
 checksumBehavior: ignore
 
+compressionLevel: mixed
+
+enableGlobalCache: false
+
+nodeLinker: node-modules
+
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
     spec: "https://mskelton.dev/yarn-outdated/v2"
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
 
-yarnPath: .yarn/releases/yarn-3.2.1.cjs
+yarnPath: .yarn/releases/yarn-4.0.0.cjs

Dockerfile

@@ -58,7 +58,7 @@ RUN apt-get update && apt-get install -y \
   cron \
   curl \
   gnupg \
-  imagemagick \
+  libvips \
   && rm -rf /var/lib/apt/lists/*
 
 # We'll also need the exact version of PostgreSQL client, matching our server version, so let's get it from official repos.

Dockerfile.evaluation

@@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y \
   cron \
   curl \
   gnupg \
-  imagemagick
+  libvips
 
 # Install gems.
 COPY Gemfile .

Gemfile

@@ -3,7 +3,7 @@ ruby "3.2.2"
 source "https://rubygems.org"
 
 # Ruby on Rails. http://rubyonrails.org
-gem "rails", "~> 6.1.7.4"
+gem "rails", "~> 7.0.8"
 
 gem "dotenv-rails", "~> 2.8", groups: %i[development test]
 
@@ -13,7 +13,8 @@ gem "fastimage", "~> 2.2"
 gem "image_processing", "~> 1.12" # Gem to support variants in ActiveStorage
 
 gem "vite_rails", "~> 3.0" # Use Vite in Rails and bring joy to your JavaScript experience.
-gem "devise", "~> 4.7", ">= 4.7.1" # User auth library.
+gem "sprockets-rails", "~> 3.4" # Provides Sprockets implementation for Rails 4.x (and beyond) Asset Pipeline
+gem "devise", "~> 4.9", ">= 4.9.2" # User auth library.
 gem "jbuilder", "~> 2.11" # Standard part of Rails, but unused, since we don't have an API.
 gem "pg", "~> 1.2" # PostgreSQL support.
 gem "pg_search", "~> 2.3" # builds ActiveRecord named scopes that take advantage of PostgreSQL's full text search.
@@ -22,7 +23,7 @@ gem "turbolinks", "~> 5.2" # Quicker page navigation. https://github.com/turboli
 gem "rest-client", "~> 2.1" # Used to contact Fast Alerts' API.
 gem "valid_url", "= 0.0.4", github: "ralovets/valid_url" # URL validation: https://github.com/ralovets/valid_url
 gem "puma", "~> 5.0" # Use the Puma web server [https://github.com/puma/puma]
-gem "slowpoke", "~> 0.3" # Rack::Timeout enhancements for Rails. https://github.com/ankane/slowpoke
+gem "slowpoke", "~> 0.5.0" # Rack::Timeout enhancements for Rails. https://github.com/ankane/slowpoke
 gem "delayed_job_active_record", "~> 4.1" # Delayed Job for deferring tasks.
 gem "delayed-web", "~> 0.4" # A rails engine that provides a simple web interface for exposing the Delayed::Job queue.
 gem "seedbank", "~> 0.5" # Better organized seed data.
@@ -31,7 +32,7 @@ gem "kramdown", "~> 2.3" # kramdown is a fast, pure Ruby Markdown superset conve
 gem "motion-markdown-it", "~> 13.0" # Ruby version of Markdown-it (a CommonMark compliant extensible parser).
 gem "motion-markdown-it-plugins", "~> 8.4" # Plugins for motion-markdown-it.
 gem "gaffe", "~> 1.2" # Custom error pages. https://github.com/mirego/gaffe
-gem "acts-as-taggable-on", "~> 9.0" # Tag a single model on several contexts.
+gem "acts-as-taggable-on", "~> 10.0" # Tag a single model on several contexts.
 gem "email_inquire", "~> 0.11" # Validate email for format, common typos and one-time email providers
 gem "titleize", "~> 1.4" # better titleizing, modifies Inflector.titleize from default rails
 gem "reform", "~> 2.6" # Form objects decoupled from models. http://www.trailblazer.to/gems/reform
@@ -47,11 +48,11 @@ gem "kaminari", "~> 1.2" # Scope & Engine based, clean, powerful, customizable a
 gem "redis", "~> 5.0" # Redis client for use as cache store for rack-attack
 gem "rack-attack", "~> 6.6" # A rack middleware for throttling and blocking abusive requests
 gem "web-push", "~> 3.0" # Web Push library for Ruby (RFC8030).
-gem "activerecord-nulldb-adapter", "~> 0.8" # A database backend that translates database interactions into no-ops.
+gem "activerecord-nulldb-adapter", "~> 1.0" # A database backend that translates database interactions into no-ops.
 gem "discordrb", "~> 3.5" # A Ruby wrapper for the Discord API.
 gem "groupdate", "~> 6.1" # Group ActiveRecord results by day, week, month, quarter, year, or hour.
 gem "discorb", "~> 0.20.0" # A Ruby wrapper for the Discord Bot.
-gem 'octokit', '~> 6.1.1' # A Ruby toolkit for the GitHub API.
+gem "octokit", "~> 8.0" # A Ruby toolkit for the GitHub API.
 
 # OmniAuth providers
 gem "omniauth-google-oauth2", "~> 1.1" # Oauth2 strategy for Google.
@@ -69,9 +70,9 @@ gem "batch-loader", "~> 2.0" # Generic lazy batching mechanism to avoid N+1 DB q
 gem "recaptcha", "~> 5.14" # ReCaptcha helpers for Ruby apps. http://github.com/ambethia/recaptcha
 
 # Feature toggle
-gem "flipper", "~> 0.22"
-gem "flipper-ui", "~> 0.22"
-gem "flipper-active_record", "~> 0.22"
+gem "flipper", "~> 1.0"
+gem "flipper-ui", "~> 1.0"
+gem "flipper-active_record", "~> 1.0"
 
 group :development do
   gem "letter_opener_web", "~> 2.0" # A web interface for browsing Ruby on Rails sent emails.
@@ -93,7 +94,7 @@ group :test do
   gem "factory_bot_rails", "~> 6.2" # A library for setting up Ruby objects as test data.
   gem "capybara", "~> 3.39" # For RSpec feature tests.
   gem "capybara-email", "~> 3.0" # Test ActionMailer and Mailer messages with Capybara
-  gem 'selenium-webdriver', '~> 4.11' # Ruby bindings for Selenium
+  gem "selenium-webdriver", "~> 4.11" # Ruby bindings for Selenium
   gem "capybara-screenshot", "~> 1.0" # Save screenshots on failure!
   gem "rspec-eventually", "~> 0.2.2" # Rspec helper to match eventually
   gem "diffy", "~> 3.4" # Easy Diffing in Ruby. https://github.com/samg/diffy