Skip to content
Draft
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
1 change: 0 additions & 1 deletion .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ PUSHER_APP_KEY=123456
PUSHER_APP_SECRET=34214341
PUSHER_APP_CLUSTER=123
VITE_PUSHER_SOCKET_URL='ws://ws-123.pusher.com/app/123456'
PUSHER_HOST="pusherfake"
PUSHER_PORT="8888"
VITE_PUSHER_WS_HOST="127.0.0.1"
VITE_PUSHER_WS_PORT="45449"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cm42-central.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Install Ruby and gems
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.0.7
ruby-version: 3.1.7
- name: Run bundle install
run: bundle install
# Add or replace database setup steps here
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
- name: Install Ruby and gems
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.0.7
ruby-version: 3.1.7
- name: Run bundle install
run: bundle install
- name: Install Node
Expand Down
46 changes: 23 additions & 23 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

ruby '3.0.7'
ruby '3.1.7'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
Expand All @@ -10,35 +10,35 @@ end
gem 'rails', '~> 6.1.7'

gem 'activeadmin'
gem 'api-pagination'
gem 'attachinary'
gem 'autoprefixer-rails'
gem 'bootstrap-sass', '~> 3.4.0'
gem 'chartkick'
gem 'chronic'
gem 'api-pagination', '~> 6.0'
gem 'attachinary', '~> 1.3', '>= 1.3.1'
gem 'autoprefixer-rails', '~> 10.4', '>= 10.4.7.0' # The higher versions are broken in the CI, so for now we will keep this version, which is still stable.
gem 'bootstrap-sass', '~> 3.4', '>= 3.4.1'
gem 'chartkick', '~> 5.1', '>= 5.1.5'
gem 'chronic', '~> 0.10.2'
gem 'cloudinary'
gem 'coffee-rails'
gem 'compass-rails', '~> 3.1.0'
gem 'configuration'
gem 'dalli', '~> 3.2.3'
gem 'coffee-rails', '~> 5.0'
gem 'configuration', '~> 1.3', '>= 1.3.4'
gem 'dalli', '~> 3.2', '>= 3.2.8'
gem 'devise'
gem 'devise-async'
gem 'devise-authy', '~> 1.10.0'
gem 'devise-i18n'
gem 'differ'
gem 'dotenv-rails'
gem 'enumerize', '~> 2.5.0'
gem 'faraday'
gem 'foreman'
gem 'differ', '~> 0.1.2'
gem 'dotenv-rails', '~> 3.1', '>= 3.1.8'
gem 'enumerize', '~> 2.8', '>= 2.8.1'
gem 'faraday', '~> 2.13', '>= 2.13.4'
gem 'foreman', '~> 0.90.0'
gem 'friendly_id', '~> 5.2.5'
gem 'gravtastic'
gem 'gravtastic', '~> 3.2', '>= 3.2.6'
gem 'i18n-js', '~> 3.9.0'
gem 'jquery-atwho-rails'
gem 'jquery-ui-rails'
gem 'kaminari'
gem 'material_icons'
gem 'pg'
gem 'pg_search'
gem 'jquery-atwho-rails', '~> 1.5', '>= 1.5.4'
gem 'jquery-ui-rails', '~> 8.0'
gem 'kaminari', '~> 1.2', '>= 1.2.2'
gem 'material_icons', '~> 2.2'
gem 'pg', '~> 1.6', '>= 1.6.2'
gem 'pg_search', '~> 2.3', '>= 2.3.7'
gem 'platform-api'
gem 'puma', '~> 5.6.4'
gem 'pundit'
Expand Down Expand Up @@ -67,7 +67,7 @@ end
group :production do
gem 'kgio'
gem 'letsencrypt-rails-heroku'
gem 'newrelic_rpm'
gem 'newrelic_rpm', '~> 9.21'
gem 'rack-cache'
gem 'rack-timeout'
gem 'rails_12factor'
Expand Down
99 changes: 50 additions & 49 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ GEM
zeitwerk (~> 2.3)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
api-pagination (4.8.2)
api-pagination (6.0.0)
arbre (1.5.0)
activesupport (>= 3.0.0, < 7.1)
ruby2_keywords (>= 0.0.2, < 1.0)
Expand Down Expand Up @@ -129,7 +129,7 @@ GEM
capybara-screenshot (1.0.26)
capybara (>= 1.0, < 4)
launchy
chartkick (4.2.0)
chartkick (5.1.5)
childprocess (4.1.0)
chronic (0.10.2)
chunky_png (1.4.0)
Expand Down Expand Up @@ -174,7 +174,7 @@ GEM
cypress-on-rails (1.13.1)
rack
daemons (1.4.1)
dalli (3.2.3)
dalli (3.2.8)
database_cleaner (2.0.1)
database_cleaner-active_record (~> 2.0.0)
database_cleaner-active_record (2.0.1)
Expand Down Expand Up @@ -204,10 +204,10 @@ GEM
docile (1.4.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dotenv (2.7.6)
dotenv-rails (2.7.6)
dotenv (= 2.7.6)
railties (>= 3.2)
dotenv (3.1.8)
dotenv-rails (3.1.8)
dotenv (= 3.1.8)
railties (>= 6.1)
dry-cli (1.0.0)
dry-core (0.7.1)
concurrent-ruby (~> 1.0)
Expand All @@ -227,7 +227,7 @@ GEM
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
enumerize (2.5.0)
enumerize (2.8.1)
activesupport (>= 3.2)
equalizer (0.0.11)
erubi (1.12.0)
Expand All @@ -240,13 +240,15 @@ GEM
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
faraday (2.3.0)
faraday-net_http (~> 2.0)
ruby2_keywords (>= 0.0.4)
faraday (2.13.4)
faraday-net_http (>= 2.0, < 3.5)
json
logger
faraday-net_http (2.0.3)
faraday-retry (1.0.3)
ffi (1.15.5)
foreman (0.87.2)
foreman (0.90.0)
thor (~> 1.4)
formtastic (4.0.0)
actionpack (>= 5.2.0)
formtastic_i18n (0.7.0)
Expand Down Expand Up @@ -286,7 +288,7 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (6.0.1)
jquery-ui-rails (8.0.0)
railties (>= 3.2.16)
json (2.6.2)
kaminari (1.2.2)
Expand All @@ -313,6 +315,7 @@ GEM
actionmailer (>= 3.2)
letter_opener (~> 1.0)
railties (>= 3.2)
logger (1.7.0)
loofah (2.19.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
Expand All @@ -330,7 +333,6 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2022.0105)
mini_mime (1.1.2)
mini_portile2 (2.8.2)
minitest (5.17.0)
moneta (1.0.0)
multi_json (1.15.0)
Expand All @@ -346,19 +348,18 @@ GEM
net-smtp (0.3.3)
net-protocol
netrc (0.11.0)
newrelic_rpm (8.9.0)
newrelic_rpm (9.21.0)
nio4r (2.5.8)
nokogiri (1.15.2)
mini_portile2 (~> 2.8.2)
nokogiri (1.15.2-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
parallel (1.22.1)
parser (3.1.2.0)
ast (~> 2.4.1)
pg (1.4.1)
pg_search (2.3.6)
activerecord (>= 5.2)
activesupport (>= 5.2)
pg (1.6.2-x86_64-linux)
pg_search (2.3.7)
activerecord (>= 6.1)
activesupport (>= 6.1)
platform-api (3.3.0)
heroics (~> 0.1.1)
moneta (~> 1.0.0)
Expand Down Expand Up @@ -445,8 +446,8 @@ GEM
activesupport (>= 6.0.4)
i18n
rate_throttle_client (0.1.2)
rb-fsevent (0.11.1)
rb-inotify (0.10.1)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
recaptcha (5.9.0)
json
Expand Down Expand Up @@ -550,7 +551,7 @@ GEM
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (1.2.1)
thor (1.4.0)
thread_safe (0.3.6)
tilt (2.0.11)
timecop (0.9.5)
Expand Down Expand Up @@ -595,56 +596,56 @@ GEM
zeitwerk (2.6.7)

PLATFORMS
ruby
x86_64-linux

DEPENDENCIES
activeadmin
api-pagination
attachinary
autoprefixer-rails
api-pagination (~> 6.0)
attachinary (~> 1.3, >= 1.3.1)
autoprefixer-rails (~> 10.4, >= 10.4.7.0)
better_errors
binding_of_caller
bootstrap-sass (~> 3.4.0)
bootstrap-sass (~> 3.4, >= 3.4.1)
bullet
capybara
capybara-lockstep
capybara-screenshot
chartkick
chronic
chartkick (~> 5.1, >= 5.1.5)
chronic (~> 0.10.2)
cloudinary
codeclimate-test-reporter
coffee-rails
coffee-rails (~> 5.0)
compass-rails (~> 3.1.0)
configuration
configuration (~> 1.3, >= 1.3.4)
cypress-on-rails (~> 1.0)
dalli (~> 3.2.3)
dalli (~> 3.2, >= 3.2.8)
database_cleaner
devise
devise-async
devise-authy (~> 1.10.0)
devise-i18n
differ
dotenv-rails
differ (~> 0.1.2)
dotenv-rails (~> 3.1, >= 3.1.8)
dry-matcher
dry-monads
enumerize (~> 2.5.0)
enumerize (~> 2.8, >= 2.8.1)
factory_bot_rails
faraday
foreman
faraday (~> 2.13, >= 2.13.4)
foreman (~> 0.90.0)
friendly_id (~> 5.2.5)
gravtastic
gravtastic (~> 3.2, >= 3.2.6)
i18n-js (~> 3.9.0)
jquery-atwho-rails
jquery-ui-rails
kaminari
jquery-atwho-rails (~> 1.5, >= 1.5.4)
jquery-ui-rails (~> 8.0)
kaminari (~> 1.2, >= 1.2.2)
kgio
letsencrypt-rails-heroku
letter_opener
letter_opener_web
material_icons
newrelic_rpm
pg
pg_search
material_icons (~> 2.2)
newrelic_rpm (~> 9.21)
pg (~> 1.6, >= 1.6.2)
pg_search (~> 2.3, >= 2.3.7)
platform-api
pry-rails
pry-remote
Expand Down Expand Up @@ -686,7 +687,7 @@ DEPENDENCIES
webmock

RUBY VERSION
ruby 3.0.7p220
ruby 3.1.7p261

BUNDLED WITH
2.5.23
2.6.9
7 changes: 4 additions & 3 deletions config/initializers/pusher.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
Pusher.logger = Rails.logger

if Rails.env.development? || Rails.env.test?
Pusher.encrypted = false
Pusher.app_id = ENV['PUSHER_APP_ID']
Pusher.key = ENV['PUSHER_APP_KEY']
Pusher.secret = ENV['PUSHER_APP_SECRET']
Pusher.host = ENV['PUSHER_HOST']&.dup
Pusher.port = ENV['PUSHER_PORT']&.to_i
Pusher.encrypted = false
Pusher.host = '127.0.0.1'
Pusher.port = (ENV['PUSHER_PORT'] || '8888').to_i
end
8 changes: 3 additions & 5 deletions config/initializers/pusher_fake.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
if Rails.env.development? || Rails.env.test?
if (Rails.env.development? || Rails.env.test?) && ENV['PUSHER_FAKE'] == '1'
require "pusher-fake"
PusherFake.configure do |configuration|
configuration.verbose = true
end
end
PusherFake.configuration.verbose = true
end