Skip to content

Commit e76f579

Browse files
authored
Merge branch 'master' into update_keppel
2 parents 6bce228 + 4268a2e commit e76f579

29 files changed

+766
-451
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
*.rbc
22
*.sassc
33
.sass-cache
4+
.devcontainer
45
.rspec
56
/.bundle
67
/vendor/bundle

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.7
1+
3.4.5

Gemfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ source 'https://rubygems.org'
1212
gem 'unf', '>= 0.2.0beta2'
1313

1414
gem 'jsbundling-rails'
15-
gem 'rails', '7.0.8.1'
15+
gem 'rails', '7.1.3.2'
16+
gem 'benchmark', require: false # Ruby 3.4 compatibility
17+
gem 'ostruct'
18+
gem 'csv'
1619

1720
gem 'bootstrap-sass'
1821
gem 'haml-rails'

0 commit comments

Comments
 (0)