Merge pull request #2469 from FarmBot/staging

v15.10.0

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 executors:
   build-executor:
     machine:
-      image: ubuntu-2204:edge
+      image: ubuntu-2404:current
     resource_class: xlarge
     working_directory: /home/circleci/project
 

.eslintrc.js

@@ -16,6 +16,7 @@ module.exports = {
         "no-null",
         "import",
         "promise",
+        "@react-three",
     ],
     extends: [
         "eslint:recommended",
@@ -29,6 +30,7 @@ module.exports = {
         "plugin:import/errors",
         "plugin:import/warnings",
         "plugin:import/typescript",
+        "plugin:@react-three/recommended",
     ],
     settings: {
         react: {

.gitignore

@@ -5,6 +5,7 @@
 .vscode
 *.log
 *.pem
+*.sql
 passenger.*.pid
 *.tsbuildinfo
 *.pid.lock
@@ -24,10 +25,8 @@ package-lock.json
 public/assets/
 public/direct_upload/temp/*.jpg
 public/dist
+core
+upgrade_deps.sh
 # ActiveStorage blobs:
 storage/*
 tmp
-
-# === Legacy
-# v13 upgrade creates a DB backup as dump.sql:
-dump.sql

.ruby-version

@@ -1 +1 @@
-3.1.6
+3.3.5

Gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
-ruby "~> 3.1.6"
+ruby "~> 3.3.5"
 
 gem "rails", "~> 6"
 gem "active_model_serializers"
@@ -41,7 +41,6 @@ group :development, :test do
   gem "rspec_junit_formatter"
   gem "simplecov"
   gem "simplecov-cobertura"
-  gem "smarf_doc", git: "https://github.com/RickCarlino/smarf_doc.git"
   gem "webmock"
 end