Merge commit 'da4cf6e1f57caa3f2ddf587c6e27a598031ef8ba' into codeocean-tuil

Author: Benedikt Artelt

.devcontainer/Dockerfile

@@ -1,3 +1,3 @@
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version
-ARG RUBY_VERSION=3.3.5
+ARG RUBY_VERSION=3.3.6
 FROM ghcr.io/rails/devcontainer/images/ruby:$RUBY_VERSION

.github/workflows/ci.yml

@@ -78,10 +78,10 @@ jobs:
         env:
           RAILS_ENV: test
           CC_TEST_REPORTER_ID: true
-        run: bundle exec rspec --color --format RSpec::Github::Formatter --format progress --require spec_helper --require rails_helper
+        run: bundle exec rspec --color --format RSpec::Github::Formatter --format progress
 
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         if: ${{ success() || failure() }}
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/codeql-analysis.yml

@@ -2,10 +2,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ main ]
   schedule:
     - cron: '34 3 * * 6'
 

.github/workflows/sentry-release.yml

@@ -2,7 +2,7 @@ name: Create a Sentry release
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   create-release:

.ruby-version

@@ -1 +1 @@
-ruby-3.3.5
+ruby-3.3.6

Dockerfile

@@ -5,7 +5,7 @@
 # docker run -d -p 80:80 -p 443:443 --name my-app -e RAILS_MASTER_KEY=<value from config/master.key> my-app
 
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version
-ARG RUBY_VERSION=3.3.5
+ARG RUBY_VERSION=3.3.6
 FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base
 
 # Rails app lives here

Gemfile

@@ -36,7 +36,7 @@ gem 'proformaxml', '~> 1.5.1'
 gem 'prometheus_exporter'
 gem 'puma'
 gem 'pundit'
-gem 'rails', '~> 7.2.1'
+gem 'rails', '~> 7.2.2'
 gem 'rails_admin'
 gem 'rails-i18n'
 gem 'rails-timeago'
@@ -52,7 +52,7 @@ gem 'sorcery'
 gem 'sprockets-rails'
 gem 'telegraf'
 gem 'terser', require: false
-gem 'tubesock'
+gem 'tubesock', github: 'openhpi/tubesock'
 gem 'turbolinks'
 gem 'whenever', require: false
 gem 'zxcvbn-ruby', require: 'zxcvbn'