Merge tag 'v1.6.18'

# Conflicts:
#	.github/workflows/_reusable_workflows.yml
#	.github/workflows/ci-cd-pipeline-bt-internal.yml
#	.github/workflows/ci-cd-pipeline-main.yml
#	.github/workflows/ci-cd-pipeline.yml
#	Gemfile.lock

.circleci/db_schema_check

@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# https://gist.github.com/vncsna/64825d5609c146e80de8b1fd623011ca
+set -euxo pipefail
+
 bundle exec rails db:migrate
 GIT_STATUS=`git status db/schema.rb`
 echo $GIT_STATUS

.github/workflows/_reusable_workflows.yml

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # This is a dummy workflow that's just here to add a bit of organization to the workflow list.
 # Too bad they don't allow you to hide workflows or something.
 name: " 🚫 |----- Reusable Worfklows Below"
@@ -10,3 +11,17 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+||||||| 3ff18b8
+=======
+# This is a dummy workflow that's just here to add a bit of organization to the workflow list.
+# Too bad they don't allow you to hide workflows or something.
+name: " 🚫 |----- Reusable Worfklows Below"
+on:
+  workflow_call:
+
+jobs:
+  nothing:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "Nothing to see here. Move along. 🎇"
+>>>>>>> v1.6.18

.github/workflows/ci-cd-pipeline-bt-internal.yml

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # This workflow will run whenever a PR is opened or changed.
 #
 # It will run tests and a few safety checks.
@@ -18,3 +19,30 @@ jobs:
     name: 🏗️ Super Scaffolding Tests
     uses: ./.github/workflows/_run_super_scaffolding_tests.yml
     secrets: inherit
+||||||| 3ff18b8
+=======
+# This workflow will run whenever a PR is opened or changed.
+#
+# It will run tests and a few safety checks.
+#
+# If everything passes it can be set to auto-deploy to your staging app on Heroku.
+#
+# This workflow is primarily meant to be triggered automatically, but it can be run manually.
+name: " 🚅 _ BT - Internal CI"
+on:
+  workflow_dispatch:
+  pull_request:
+    types: [opened, synchronize, reopened]
+  push:
+    branches: [ "main" ]
+
+jobs:
+  super_scaffolding:
+    # This makes it so that this job only runs in the starter repo itself, and not in
+    # applications started from the starter repo. If you want to run super scaffolding
+    # test for your own app you can remove or comment out this next line.
+    if: github.repository == 'bullet-train-co/bullet_train'
+    name: 🏗️ Super Scaffolding Tests
+    uses: ./.github/workflows/_run_super_scaffolding_tests.yml
+    secrets: inherit
+>>>>>>> v1.6.18

.github/workflows/ci-cd-pipeline-main.yml

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # This workflow will run whenever commits land on the main branch.
 #
 # It will run tests and a few safety checks.
@@ -34,3 +35,42 @@ jobs:
     secrets: inherit
     with:
       heroku-app-name: "bullettrain-co"
+||||||| 3ff18b8
+=======
+# This workflow will run whenever commits land on the main branch.
+#
+# It will run tests and a few safety checks.
+#
+# If everything passes it can be set to auto-deploy to your production app on Heroku.
+#
+# This workflow is primarily meant to be triggered automatically, but it can be run manually.
+name: " 🎥 Main CI (prod)"
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "main" ]
+
+jobs:
+  minitest:
+    name: 🧪 Minitest
+    uses: ./.github/workflows/_run_tests.yml
+    secrets: inherit
+  standardrb:
+    name: 🔬 Standardrb
+    uses: ./.github/workflows/_standardrb.yml
+    secrets: inherit
+  db_schema:
+    name: 🔎 DB Schema
+    uses: ./.github/workflows/_database_schema_check.yml
+    secrets: inherit
+  # If you'd like to auto-deploy to your production environment you can uncomment this next block.
+  # You'll need to set HEROKU_EMAIL and HEROKU_API_KEY in your repo secrets.
+  # Be sure to set the app name correctly below.
+  # deploy:
+  #   name: 🚢 Deploy to Heroku
+  #   uses: ./.github/workflows/_deploy_heroku.yml
+  #   needs: [mini_test, standardrb, db_schema]
+  #   secrets: inherit
+  #   with:
+  #     heroku-app-name: ""
+>>>>>>> v1.6.18

.github/workflows/ci-cd-pipeline.yml

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # This workflow will run whenever a PR is opened or changed.
 #
 # It will run tests and a few safety checks.
@@ -34,3 +35,42 @@ jobs:
   #   secrets: inherit
   #   with:
   #     heroku-app-name: ""
+||||||| 3ff18b8
+=======
+# This workflow will run whenever a PR is opened or changed.
+#
+# It will run tests and a few safety checks.
+#
+# If everything passes it can be set to auto-deploy to your staging app on Heroku.
+#
+# This workflow is primarily meant to be triggered automatically, but it can be run manually.
+name: " 💻 PR CI (staging)"
+on:
+  workflow_dispatch:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  mini_test:
+    name: 🧪 MiniTest
+    uses: ./.github/workflows/_run_tests.yml
+    secrets: inherit
+  standardrb:
+    name: 🔬 Standardrb
+    uses: ./.github/workflows/_standardrb.yml
+    secrets: inherit
+  db_schema:
+    name: 🔎 DB Schema
+    uses: ./.github/workflows/_database_schema_check.yml
+    secrets: inherit
+  # If you'd like to auto-deploy to your staging environment you can uncomment this next block.
+  # You'll need to set HEROKU_EMAIL and HEROKU_API_KEY in your repo secrets.
+  # Be sure to set the app name correctly below.
+  # deploy:
+  #   name: 🚢 Deploy to Heroku
+  #   uses: ./.github/workflows/_deploy_heroku.yml
+  #   needs: [mini_test, standardrb, db_schema]
+  #   secrets: inherit
+  #   with:
+  #     heroku-app-name: ""
+>>>>>>> v1.6.18

Gemfile

@@ -64,7 +64,8 @@ group :development, :test do
   gem "simplecov", require: false
 
   # Generate test objects.
-  gem "factory_bot_rails"
+  # 6.3.0 and 6.4.0 have a bug https://github.com/thoughtbot/factory_bot_rails/issues/433
+  gem "factory_bot_rails", "~> 6.2", "!= 6.3.0", "!= 6.4.0"
 end
 
 group :development do
@@ -102,7 +103,7 @@ end
 
 # We use a constant here so that we can ensure that all of the bullet_train-*
 # packages are on the same version.
-BULLET_TRAIN_VERSION = "1.6.7"
+BULLET_TRAIN_VERSION = "1.6.18"
 
 # Core packages.
 gem "bullet_train", BULLET_TRAIN_VERSION
@@ -122,7 +123,7 @@ gem "bullet_train-obfuscates_id", BULLET_TRAIN_VERSION
 
 # Core gems that are dependencies of gems listed above. Technically they
 # shouldn't need to be listed here, but we list them so that we can keep
-# verion numbers in sync.
+# version numbers in sync.
 gem "bullet_train-fields", BULLET_TRAIN_VERSION
 gem "bullet_train-has_uuid", BULLET_TRAIN_VERSION
 gem "bullet_train-roles", BULLET_TRAIN_VERSION