Skip to content

Commit 892515a

Browse files
author
Benedikt Artelt
committed
Merge commit 'd25c45708957013e5949d214dbb4d3f5ca55386d' into swp_autoping_implement_modular_layout
2 parents 6ef20ae + d25c457 commit 892515a

File tree

95 files changed

+2904
-1490
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+2904
-1490
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version
2-
ARG RUBY_VERSION=3.3.6
2+
ARG RUBY_VERSION=3.4.1
33
FROM ghcr.io/rails/devcontainer/images/ruby:$RUBY_VERSION

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117
reporter: github-check
118118
skip_install: true
119119
use_bundler: true
120-
fail_on_error: true
120+
fail_level: any
121121

122122
slim-lint:
123123
permissions:
@@ -170,4 +170,4 @@ jobs:
170170
reporter: github-check
171171
skip_install: true
172172
use_bundler: true
173-
fail_on_error: true
173+
fail_level: any

.rubocop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ inherit_from:
1717
- .rubocop_todo.yml
1818

1919
AllCops:
20-
TargetRubyVersion: 3.3
21-
TargetRailsVersion: 7.1
20+
TargetRubyVersion: 3.4
21+
TargetRailsVersion: 8.0
2222
UseCache: True
2323
NewCops: enable
2424
Exclude:

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby-3.3.6
1+
ruby-3.4.1

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# docker run -d -p 80:80 -p 443:443 --name my-app -e RAILS_MASTER_KEY=<value from config/master.key> my-app
66

77
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version
8-
ARG RUBY_VERSION=3.3.6
8+
ARG RUBY_VERSION=3.4.1
99
FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base
1010

1111
# Rails app lives here

Gemfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ gem 'proformaxml', '~> 1.5.1'
3636
gem 'prometheus_exporter'
3737
gem 'puma'
3838
gem 'pundit'
39-
gem 'rails', '~> 7.2.2'
39+
gem 'rails', '~> 8.0.1'
4040
gem 'rails_admin'
4141
gem 'rails-i18n'
4242
gem 'rails-timeago'
4343
gem 'ransack'
4444
gem 'rubytree'
4545
gem 'rubyzip'
4646
gem 'sassc-rails'
47-
gem 'shakapacker', '8.0.2'
47+
gem 'shakapacker', '8.1.0'
4848
gem 'slim-rails'
4949
gem 'solid_cable'
5050
gem 'solid_queue'
@@ -54,6 +54,7 @@ gem 'telegraf'
5454
gem 'terser', require: false
5555
gem 'tubesock', github: 'openhpi/tubesock'
5656
gem 'turbolinks'
57+
gem 'webauthn'
5758
gem 'whenever', require: false
5859
gem 'zxcvbn-ruby', require: 'zxcvbn'
5960

@@ -74,8 +75,6 @@ group :development, :staging do
7475
gem 'i18n-tasks'
7576
gem 'letter_opener'
7677
gem 'listen'
77-
gem 'pry-byebug'
78-
gem 'pry-rails'
7978
gem 'rack-mini-profiler'
8079
gem 'rubocop'
8180
gem 'rubocop-capybara'

0 commit comments

Comments
 (0)