Merge pull request #2458 from FarmBot/staging

v15.9.2
FarmBot · Feb 1, 2024 · dfe4057 · dfe4057
2 parents a2422ea + 4ed5ca0
commit dfe4057
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,7 +4,7 @@ executors:
   build-executor:
     machine:
       image: ubuntu-2204:edge
-    resource_class: large
+    resource_class: xlarge
     working_directory: /home/circleci/project
 
 commands:

diff --git a/Gemfile b/Gemfile
@@ -26,6 +26,7 @@ gem "tzinfo" # For validation of user selected timezone names
 gem "valid_url"
 gem "thwait"
 gem "lograge" # Used to filter repetitive RabbitMQ logs.
+gem "scout_apm"
 
 group :development, :test do
   gem "climate_control"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -74,6 +74,7 @@ GEM
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     amq-protocol (2.3.2)
+    ast (2.4.2)
     bcrypt (3.1.20)
     builder (3.2.4)
     bunny (2.22.0)
@@ -235,6 +236,9 @@ GEM
       racc (~> 1.4)
     orm_adapter (0.5.0)
     os (1.1.4)
+    parser (3.3.0.5)
+      ast (~> 2.4.1)
+      racc
     passenger (6.0.20)
       rack
       rake (>= 0.8.1)
@@ -334,6 +338,8 @@ GEM
     scenic (1.7.0)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
+    scout_apm (5.3.5)
+      parser
     secure_headers (6.5.0)
     set (1.1.0)
     signet (0.18.0)
@@ -418,6 +424,7 @@ DEPENDENCIES
   rspec-rails
   rspec_junit_formatter
   scenic
+  scout_apm
   secure_headers
   simplecov
   simplecov-cobertura