diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59824c8..ec824d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: - name: Install Ruby and gems uses: ruby/setup-ruby@v1 with: - ruby-version: 3.3.4 + ruby-version: 3.3.5 bundler-cache: true - name: Set up database schema run: bin/rails db:schema:load @@ -54,7 +54,7 @@ jobs: - name: Install Ruby and gems uses: ruby/setup-ruby@v1 with: - ruby-version: 3.3.4 + ruby-version: 3.3.5 bundler-cache: true - name: Set up database schema run: bin/rails db:schema:load @@ -69,7 +69,7 @@ jobs: - name: Install Ruby and gems uses: ruby/setup-ruby@v1 with: - ruby-version: 3.3.4 + ruby-version: 3.3.5 bundler-cache: true - name: Security audit dependencies run: bundle exec bundler-audit --update @@ -100,7 +100,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.3.4 + ruby-version: 3.3.5 bundler-cache: true - name: Set up Docker Buildx id: buildx @@ -144,7 +144,7 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.3.4 + ruby-version: 3.3.5 bundler-cache: true - uses: webfactory/ssh-agent@v0.9.0 with: diff --git a/.github/workflows/kamal.yml b/.github/workflows/kamal.yml index 0a693c4..a7cdbbb 100644 --- a/.github/workflows/kamal.yml +++ b/.github/workflows/kamal.yml @@ -26,6 +26,6 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.3.4 + ruby-version: 3.3.5 - name: Run KAMAL command run: ${{ github.event.inputs.command }} diff --git a/.ruby-version b/.ruby-version index a0891f5..fa7adc7 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.4 +3.3.5 diff --git a/.tool-versions b/.tool-versions index 05668b7..1dd1998 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 3.3.4 +ruby 3.3.5 diff --git a/Dockerfile b/Dockerfile index 8d1ca36..9d8c5ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax = docker/dockerfile:1 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile -ARG RUBY_VERSION=3.3.4 +ARG RUBY_VERSION=3.3.5 ARG APP_VERSION=undefined FROM ruby:$RUBY_VERSION-slim AS base diff --git a/Dockerfile.development b/Dockerfile.development index c2495ae..97c3b6f 100644 --- a/Dockerfile.development +++ b/Dockerfile.development @@ -1,7 +1,7 @@ # syntax = docker/dockerfile:1 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile -ARG RUBY_VERSION=3.3.4 +ARG RUBY_VERSION=3.3.5 FROM ruby:$RUBY_VERSION-slim as base # Rails app lives here diff --git a/Gemfile.lock b/Gemfile.lock index 0ddcdc0..deaf2ba 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -552,7 +552,7 @@ DEPENDENCIES yabeda-rails RUBY VERSION - ruby 3.3.4p94 + ruby 3.3.5p100 BUNDLED WITH - 2.5.6 + 2.5.18 diff --git a/README.md b/README.md index 767076c..82c5604 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The software is still a work in progress. Expect huge variations. ## Develop I suggest you to use [asdf](https://asdf-vm.com/) -Install ruby 3.3.4 +Install ruby 3.3.5 Start the needed services with docker compose: diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index d84cb6e..ba861c0 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true class ApplicationMailer < ActionMailer::Base - default from: 'from@example.com' + default from: 'info@opengas.eu' layout 'mailer' end diff --git a/config/environments/production.rb b/config/environments/production.rb index d930c5f..2d939ae 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -3,6 +3,9 @@ require 'active_support/core_ext/integer/time' Rails.application.configure do + # Prepare the ingress controller used to receive mail + # config.action_mailbox.ingress = :relay + # Settings specified here will take precedence over those in config/application.rb. # Code is not reloaded between requests. diff --git a/test/mailers/medical_certificate_mailer_test.rb b/test/mailers/medical_certificate_mailer_test.rb index 648ddab..2200daa 100644 --- a/test/mailers/medical_certificate_mailer_test.rb +++ b/test/mailers/medical_certificate_mailer_test.rb @@ -11,7 +11,7 @@ class MedicalCertificateMailerTest < ActionMailer::TestCase email.deliver_now end - assert_equal ['from@example.com'], email.from + assert_equal ['info@opengas.eu'], email.from assert_equal [member.email], email.to end end diff --git a/test/mailers/previews/receipt_mailer_preview.rb b/test/mailers/previews/receipt_mailer_preview.rb new file mode 100644 index 0000000..08c87fe --- /dev/null +++ b/test/mailers/previews/receipt_mailer_preview.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +# Preview all emails at http://localhost:3000/rails/mailers/receipt_mailer +class ReceiptMailerPreview < ActionMailer::Preview + def collaborator_receipt_email + expense = Expense.joins(:user).distinct.first + ReceiptMailer.with(expense:).collaborator_receipt_email + end + + def member_receipt_email + ReceiptMailer.with(payment: Payment.first).member_receipt_email + end +end