Skip to content

Commit c474a34

Browse files
authored
Merge branch 'main' into dependabot/bundler/active_storage_validations-2.0.2
Signed-off-by: Robert Smith <[email protected]>
2 parents fd41a53 + bd53285 commit c474a34

File tree

580 files changed

+13365
-5071
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

580 files changed

+13365
-5071
lines changed

.github/workflows/rubyonrails.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
name: "Ruby on Rails CI"
88
on:
99
push:
10-
branches: [ "main" ]
10+
branches: [ "main", "dev" ]
1111
pull_request:
12-
branches: [ "main" ]
12+
branches: [ "main", "dev" ]
1313
jobs:
1414
rspec:
1515
runs-on: ubuntu-latest

Dockerfile.dev

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,23 @@
22

33
FROM ruby:3.2.2
44

5+
# Add system dependencies needed for building gems, running JS, and running Chrome Headless
56
RUN apt-get update -qq \
67
&& apt-get install -y build-essential postgresql-client libpq-dev \
7-
nodejs libssl-dev apt-transport-https ca-certificates libvips42 nano
8+
nodejs libssl-dev apt-transport-https ca-certificates libvips42 nano \
9+
chromium chromium-driver
810

11+
# Create app directory
912
RUN mkdir /community-engine
1013
WORKDIR /community-engine
14+
15+
# Pre-bundle install step
1116
COPY Gemfile /community-engine/Gemfile
1217
COPY Gemfile.lock /community-engine/Gemfile.lock
1318

19+
# Use specific Bundler version (you could also lock this in your Gemfile.lock instead)
1420
RUN gem uninstall bundler
1521
RUN gem install bundler:2.4.13
1622

23+
# Copy entire app source (this assumes you're using volume mounting during development)
1724
COPY . /community-engine

Gemfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ gem 'rack-protection'
3030
gem 'rails', '~> 7.1.3'
3131

3232
# Redis for ActionCable and background jobs
33-
gem 'redis', '~> 5.3'
33+
gem 'redis', '~> 5.4'
3434

3535
gem 'rswag'
3636

3737
# Sidekiq for background processing
38-
gem 'sidekiq', '~> 7.3.8'
38+
gem 'sidekiq', '~> 7.3.9'
3939

4040
# Error and performance monitoring with Sentry
4141
gem 'sentry-rails'
@@ -76,6 +76,8 @@ group :development do
7676
gem 'bundler-audit', require: false
7777
# Facilitate I18n translation management
7878
gem 'i18n_generators'
79+
80+
gem 'easy_translate'
7981
# Listen for file system changes
8082
gem 'listen', '>= 3.0.5', '< 3.10'
8183
# Rack mini profiler for performance profiling
@@ -95,13 +97,14 @@ end
9597
group :test do
9698
# Capybara for integration testing
9799
gem 'capybara', '>= 2.15'
100+
gem 'capybara-screenshot'
98101
# Coveralls for test coverage reporting
99102
gem 'coveralls_reborn', require: false
100103
# Database cleaner for test database cleaning
101104
gem 'database_cleaner'
102105
gem 'database_cleaner-active_record'
103106
# # Easy installation and use of chromedriver to run system tests with Chrome
104-
gem 'webdrivers'
107+
# gem 'webdrivers'
105108
# RuboCop RSpec for RSpec-specific code analysis
106109
gem 'rubocop-rspec'
107110
# RSpec for unit testing

0 commit comments

Comments
 (0)