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
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ jobs:
name: RuboCop Linter
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Setup Ruby 3.4.1
- uses: actions/checkout@v5
- name: Setup Ruby 3.4.4
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.4.1' # Not needed with a .ruby-version file
ruby-version: '3.4.4' # Not needed with a .ruby-version file
bundler-cache: true

- run: bundle exec rubocop
Expand All @@ -28,11 +28,11 @@ jobs:
--health-retries 5

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

- name: Setup Node
Expand All @@ -42,7 +42,7 @@ jobs:

- name: Find yarn cache location
id: yarn-cache
run: echo "::set-output name=dir::$(yarn cache dir)"
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT

- name: JS package cache
uses: actions/cache@v4
Expand All @@ -60,7 +60,7 @@ jobs:
DATABASE_URL: postgres://postgres:@localhost:5432/test
#POSTGRES_PASSWORD: postgres
RAILS_ENV: test
#RAILS_MASTER_KEY: ${{ secrets.RAILS_MASTER_KEY }}
RAILS_MASTER_KEY: ${{ secrets.RAILS_TEST_MASTER_KEY }}
run: |
sudo apt-get -yqq install libpq-dev
gem install bundler
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,7 @@ coverage/

# Ignore JetBrains IDE .idea directory
.idea/

/config/credentials/development.key

/config/credentials/test.key
8 changes: 7 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ require:
- rubocop-rails

AllCops:
UseCache: false
UseServer: false
NewCops: enable
SuggestExtensions:
rubocop-rake: false
TargetRubyVersion: 3.0.2
TargetRubyVersion: 3.4
Exclude:
- bin/**/*
- config/**/*
Expand All @@ -19,3 +21,7 @@ AllCops:

Style/Documentation:
Enabled: false

Rails/LexicallyScopedActionFilter:
Exclude:
- 'app/controllers/users/sessions_controller.rb'
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.4.1
3.4.4
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.1
ruby 3.4.4
18 changes: 11 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '3.4.1'
ruby '3.4.4'

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
Expand All @@ -13,24 +13,27 @@ gem 'cssbundling-rails' # Bundle and process CSS [https://github.com/rails/cssbu
gem 'devise' # Devise 4.0 works with Rails 4.1 onwards.
# 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]
gem 'jbuilder' # Build JSON APIs with ease [https://github.com/rails/jbuilder]
gem 'jsbundling-rails' # Bundle and transpile JavaScript [https://github.com/rails/jsbundling-rails]
gem 'mini_magick', '~> 4.12'
# Motor Admin allows you to deploy a no-code admin panel for your application in less than a minute
gem 'motor-admin', '~> 0.4.7'
gem 'pg', '~> 1.1' # 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', '~> 5.0' # Use the Puma web server [https://github.com/puma/puma]
gem 'puma', '~> 6.0' # Use the Puma web server [https://github.com/puma/puma]
gem 'rails', '~> 7.2.2.1' # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem 'redis', '~> 4.0' # Use Redis adapter to run Action Cable in production
# An ActionMailer adapter to send email using SendGrid's HTTPS Web API (instead of SMTP).
gem 'rack-attack' # Rack middleware for blocking & throttling abusive requests
gem 'sendgrid-actionmailer', '~> 3.2'
gem 'simple_form', '~> 5.1' # Gem to pimp up forms
gem 'sitemap_generator' # A dynamic sitemap generator gem for the Ruby on Rails framework
gem 'sprockets-rails' # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
gem 'stimulus-rails' # Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
gem 'turbo-rails' # Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'rails_cloudflare_turnstile'
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]

# gem "kredis" # Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
Expand All @@ -40,10 +43,10 @@ gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]

group :development, :test do
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
gem 'debug', platforms: %i[mri mingw x64_mingw]
gem 'rubocop', '~> 1.51.0', require: false
gem 'rubocop-performance', '~> 1.18', require: false
gem 'rubocop-rails', '~> 2.19.1', require: false
gem 'debug', '~> 1.10.0', platforms: %i[mri mingw x64_mingw]
gem 'rubocop', '~> 1.79.2', require: false
gem 'rubocop-performance', '~> 1.25.0', require: false
gem 'rubocop-rails', '~> 2.30.3', require: false
end

group :development do
Expand Down Expand Up @@ -72,7 +75,8 @@ group :test do
# Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
gem 'capybara'
gem 'faker', '~> 3.1'
gem 'mocha'
gem 'selenium-webdriver'
gem 'simplecov', require: false # Code coverage analysis tool for ruby
gem 'simplecov', require: false # Code coverage analysis tool for ruby
gem 'webdrivers'
end
Loading