Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version
ARG RUBY_VERSION=3.4.4
ARG RUBY_VERSION=3.4.7
FROM ghcr.io/rails/devcontainer/images/ruby:$RUBY_VERSION
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- name: Setup Ruby 3.4.4
- name: Setup Ruby 3.4.7
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.4.4' # Not needed with a .ruby-version file
ruby-version: '3.4.7' # Not needed with a .ruby-version file
bundler-cache: true

- run: bundle exec rubocop
Expand All @@ -29,16 +29,16 @@ jobs:

steps:
- uses: actions/checkout@v5
- name: Setup Ruby 3.4.4
- name: Setup Ruby 3.4.7
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.4.4' # Not needed with a .ruby-version file
ruby-version: '3.4.7' # Not needed with a .ruby-version file
bundler-cache: true

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '20'

- name: Find yarn cache location
id: yarn-cache
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ coverage/
/config/credentials/development.key

/config/credentials/test.key
.env.development
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.14.0
20.18.1
64 changes: 60 additions & 4 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
require:
plugins:
- rubocop-performance
- rubocop-rails

AllCops:
UseCache: false
UseServer: false
NewCops: enable
SuggestExtensions:
rubocop-rake: false
SuggestExtensions: false
TargetRubyVersion: 3.4
Exclude:
- bin/**/*
Expand All @@ -22,7 +20,65 @@ AllCops:
Style/Documentation:
Enabled: false

# Disable OpenStruct warnings for tests
Style/OpenStructUse:
Exclude:
- 'test/**/*'

# Allow longer lines in seed files and tests
Layout/LineLength:
Max: 160
Exclude:
- 'db/seeds.rb'
- 'test/**/*'

# Relax metrics for test files
Metrics/ClassLength:
Exclude:
- 'test/**/*'

Metrics/MethodLength:
Max: 15
Exclude:
- 'test/**/*'
- 'db/seeds.rb'

Metrics/BlockLength:
Exclude:
- 'test/**/*'
- 'db/seeds.rb'

Metrics/AbcSize:
Max: 25
Exclude:
- 'test/**/*'

Metrics/CyclomaticComplexity:
Max: 12

Metrics/PerceivedComplexity:
Max: 12

# Allow variable numbers in tests
Naming/VariableNumber:
Exclude:
- 'test/**/*'

# Allow empty test files
Lint/EmptyFile:
Exclude:
- 'test/**/*'

# Disable duplicate branch warnings
Lint/DuplicateBranch:
Enabled: false

# Move locale texts to locale files
Rails/I18nLocaleTexts:
Enabled: false

Rails/LexicallyScopedActionFilter:
Exclude:
- 'app/controllers/users/sessions_controller.rb'
- 'app/controllers/users/registrations_controller.rb'

2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.4
3.4.7
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
nodejs 20.9.0
ruby 3.4.4
ruby 3.4.7
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1
# Multi-stage Dockerfile for Rails 8 app with Ruby 3.4.4
# Multi-stage Dockerfile for Rails 8 app with Ruby 3.4.7

ARG RUBY_VERSION=3.4.4
ARG RUBY_VERSION=3.4.7

# Base image with Ruby and system libs
FROM ruby:${RUBY_VERSION}-slim AS base
Expand Down
11 changes: 8 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,19 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '3.4.4'
ruby '3.4.7'

gem 'active_storage_validations', '~> 1.0' # Active Storage gems for validating attachments https://github.com/igorkasyanchuk/active_storage_validations
gem 'aws-sdk-s3', '~> 1.119', require: false # Official AWS Ruby gem for Amazon S3
gem 'aws-sdk-s3', '~> 1.208', require: false # Official AWS Ruby gem for Amazon S3
gem 'bootsnap', require: false # Reduces boot times through caching; required in config/boot.rb
gem 'cancancan', '~> 3.4' # Authorization library which restricts what resources a given user is allowed to access
gem 'cssbundling-rails' # Bundle and process CSS [https://github.com/rails/cssbundling-rails]
gem 'devise' # Devise 4.0 works with Rails 4.1 onwards.
gem 'geocoder', '~> 1.8' # Complete geocoding solution for Ruby
# OAuth integration
gem 'omniauth'
gem 'omniauth-github'
gem 'omniauth-rails_csrf_protection'
# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
gem 'image_processing', '~> 1.2'
gem 'invisible_captcha' # Spam protection solution [https://github.com/markets/invisible_captcha]
Expand All @@ -22,7 +27,7 @@ gem 'motor-admin', '>= 0.4.30'
gem 'pg', '~> 1.5' # Use postgresql as the database for Active Record
gem 'premailer-rails', '~> 1.12' # This gem is a drop in solution for styling HTML emails with CSS
gem 'puma', '~> 6.0' # Use the Puma web server [https://github.com/puma/puma]
gem 'rails', '~> 8.0' # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem 'rails', '~> 8.1' # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
# Pagination
gem 'pagy', '~> 9.4.0'
# gem 'kaminari'
Expand Down
Loading