Merge branch 'main' into dependabot/bundler/puma-6.4.2

goinvo · Jan 12, 2024 · 6500d56 · 6500d56
2 parents c23376f + 5d60f4f
commit 6500d56
Show file tree

Hide file tree

Showing 39 changed files with 8 additions and 720 deletions.
diff --git a/.github/workflows/rspec-test-suite.yml b/.github/workflows/rspec-test-suite.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Install Ruby and gems
-        uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       - name: Set up database schema

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.2.0
+3.3.0
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1
 
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=3.2.0
+ARG RUBY_VERSION=3.3.0
 FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base
 
 # Rails app lives here

diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-ruby "3.2.0"
+ruby "3.3.0"
 
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
 gem "rails", "7.1.2"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -330,7 +330,7 @@ DEPENDENCIES
   web-console
 
 RUBY VERSION
-   ruby 3.2.0p0
+   ruby 3.3.0p0
 
 BUNDLED WITH
    2.4.7
diff --git a/app/components/staff_plan/assignment_component.html.erb b/app/components/staff_plan/assignment_component.html.erb
diff --git a/app/components/staff_plan/assignment_component.rb b/app/components/staff_plan/assignment_component.rb
diff --git a/app/components/staff_plan/client_component.html.erb b/app/components/staff_plan/client_component.html.erb
diff --git a/app/components/staff_plan/client_component.rb b/app/components/staff_plan/client_component.rb
diff --git a/app/components/staff_plan/header_component.html.erb b/app/components/staff_plan/header_component.html.erb
diff --git a/app/components/staff_plan/header_component.rb b/app/components/staff_plan/header_component.rb
diff --git a/app/components/staff_plan/main_component.html.erb b/app/components/staff_plan/main_component.html.erb
diff --git a/app/components/staff_plan/main_component.rb b/app/components/staff_plan/main_component.rb
diff --git a/app/components/staff_plan/work_week_component.html.erb b/app/components/staff_plan/work_week_component.html.erb
diff --git a/app/components/staff_plan/work_week_component.rb b/app/components/staff_plan/work_week_component.rb
diff --git a/app/components/staff_plan/work_weeks_component.html.erb b/app/components/staff_plan/work_weeks_component.html.erb
diff --git a/app/components/staff_plan/work_weeks_component.rb b/app/components/staff_plan/work_weeks_component.rb
diff --git a/app/controllers/staff_plans/users_controller.rb b/app/controllers/staff_plans/users_controller.rb