Skip to content

Commit d8ae9b0

Browse files
authored
Merge branch 'wip/new-to-nl-2' into wip/encrypted-rich-text-messages
Signed-off-by: Robert Smith <[email protected]>
2 parents c470905 + ad95d87 commit d8ae9b0

File tree

226 files changed

+963
-5922
lines changed

Some content is hidden

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

226 files changed

+963
-5922
lines changed

.github/workflows/rubyonrails.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
uses: actions/checkout@v3
4343
# Add or replace dependency steps here
4444
- name: Install Ruby and gems
45-
uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
45+
uses: ruby/setup-ruby@v1
4646
with:
4747
bundler-cache: true
4848
# Add or replace database setup steps here
@@ -58,7 +58,7 @@ jobs:
5858
- name: Checkout code
5959
uses: actions/checkout@v3
6060
- name: Install Ruby and gems
61-
uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
61+
uses: ruby/setup-ruby@v1
6262
with:
6363
bundler-cache: true
6464
- name: Lint Ruby files with Rubocop
@@ -70,7 +70,7 @@ jobs:
7070
- name: Checkout code
7171
uses: actions/checkout@v3
7272
- name: Install Ruby and gems
73-
uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
73+
uses: ruby/setup-ruby@v1
7474
with:
7575
bundler-cache: true
7676
- name: Generate binstubs

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ gem 'fog-aws'
2020
# Database adapter for PostgreSQL
2121
gem 'pg', '>= 0.18', '< 2.0'
2222
# Puma as the app server
23-
gem 'puma', '~> 6.4'
23+
gem 'puma', '~> 6.5'
2424

2525
# Pundit for authorization, custom fork for Better Together
2626
gem 'pundit-resources', '~> 1.1.4', github: 'better-together-org/pundit-resources'
@@ -35,7 +35,7 @@ gem 'redis', '~> 5.3'
3535
gem 'rswag'
3636

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

4040
# Error and performance monitoring with Sentry
4141
gem 'sentry-rails'

0 commit comments

Comments
 (0)