Skip to content

Commit

Permalink
Merge pull request #357 from xronos-ch/update_rails
Browse files Browse the repository at this point in the history
Update Ruby to 3.3.6 and Rails to 7.2
  • Loading branch information
MartinHinz authored Dec 16, 2024
2 parents 32594ce + aca0766 commit 45917e8
Show file tree
Hide file tree
Showing 24 changed files with 146 additions and 116 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.4
3.3.6
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# base image
FROM ruby:3.0.4
FROM ruby:3.3.6
MAINTAINER Martin Hinz <[email protected]>

# install node and yarn
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.staging
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# base image
FROM ruby:3.0.4
FROM ruby:3.3.6
MAINTAINER Martin Hinz <[email protected]>

# install node and yarn
Expand Down
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ git_source(:github) { |repo| 'https://github.com/#{repo}.git' }
# CORE ------------------------------------------------------------------------

# Ruby on Rails
ruby '3.0.4'
gem 'rails', '~> 7.0.0'
ruby '3.3.6'
gem 'rails', '~> 7.2'

# Database for Active Record
gem 'pg'
Expand Down Expand Up @@ -67,7 +67,7 @@ gem 'stimulus-rails'
# USERS & PERMISSIONS ---------------------------------------------------------

# User management
gem 'devise', '>= 4.7.1'
gem 'devise', '>= 4.9.4'

# Authorizations management
gem 'cancancan'
Expand Down Expand Up @@ -184,7 +184,7 @@ end
group :development, :test do

# RSpec for testing
gem 'rspec-rails', '~> 4.0.1'
gem 'rspec-rails', '~> 7.0.0'

# Generate test data from model specs
gem 'factory_bot_rails'
Expand Down
Loading

0 comments on commit 45917e8

Please sign in to comment.