Skip to content

Commit d965ba2

Browse files
authored
Merge branch 'master' into rails71
2 parents 7ca564b + 0fb4223 commit d965ba2

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

.github/workflows/ruby.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ jobs:
77
name: 'Tests'
88
runs-on: ubuntu-latest
99

10+
env:
11+
# prevent unnecessary log output -- https://bundler.io/man/bundle-config.1.html
12+
BUNDLE_IGNORE_FUNDING_REQUESTS: true
13+
BUNDLE_IGNORE_MESSAGES: true
1014
services:
1115
postgres:
1216
image: postgres:17

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,5 +117,6 @@ group :production do
117117
end
118118

119119
gem 'rollbar'
120+
gem 'scout_apm'
120121

121122
gem 'carrierwave-aws', '~> 1.6'

Gemfile.lock

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,8 @@ GEM
482482
sprockets-rails
483483
tilt
484484
securerandom (0.4.1)
485+
scout_apm (5.7.1)
486+
parser
485487
selenium-webdriver (4.34.0)
486488
base64 (~> 0.2)
487489
logger (~> 1.4)
@@ -622,6 +624,7 @@ DEPENDENCIES
622624
rubocop-rails
623625
rubocop-rspec
624626
sassc-rails
627+
scout_apm
625628
selenium-webdriver
626629
shoulda-matchers (~> 6.5)
627630
simple_form

0 commit comments

Comments
 (0)