Skip to content

Commit

Permalink
Merge pull request #19 from bullet-train-co/bullet-train-update/1.6.18
Browse files Browse the repository at this point in the history
Bullet Train Update: 1.6.18
  • Loading branch information
jagthedrummer authored Nov 22, 2023
2 parents 658b792 + e5da3d0 commit 5c5385d
Show file tree
Hide file tree
Showing 30 changed files with 371 additions and 377 deletions.
3 changes: 3 additions & 0 deletions .circleci/db_schema_check
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/_reusable_workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ jobs:
nothing:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- run: echo "Nothing to see here. Move along. 🎇"
6 changes: 5 additions & 1 deletion .github/workflows/ci-cd-pipeline-bt-internal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# 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 Pipeline"
name: " 🚅 _ BT - Internal CI"
on:
workflow_dispatch:
pull_request:
Expand All @@ -15,6 +15,10 @@ on:

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
6 changes: 3 additions & 3 deletions .github/workflows/ci-cd-pipeline-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
# 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/CD Pipeline (prod)"
name: " 🎥 Main CI (prod)"
on:
workflow_dispatch:
push:
branches: [ "main" ]

jobs:
mini_test:
name: 🧪 MiniTest
minitest:
name: 🧪 Minitest
uses: ./.github/workflows/_run_tests.yml
secrets: inherit
standardrb:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-cd-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# 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/CD Pipeline (staging)"
name: " 💻 PR CI (staging)"
on:
workflow_dispatch:
pull_request:
Expand Down
7 changes: 4 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
114 changes: 61 additions & 53 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,8 @@ GEM
bootsnap (1.16.0)
msgpack (~> 1.2)
builder (3.2.4)
bullet_train (1.6.7)
bullet_train (1.6.18)
awesome_print
bullet_train-fields
bullet_train-has_uuid
bullet_train-roles
bullet_train-routes
Expand All @@ -109,6 +108,7 @@ GEM
bullet_train-themes
cable_ready (~> 5.0.0)
cancancan
colorizer
commonmarker
devise
devise-pwned_password
Expand All @@ -120,6 +120,7 @@ GEM
image_processing
microscope
nice_partials (~> 0.9)
omniauth
pagy
possessive
premailer-rails
Expand All @@ -130,69 +131,74 @@ GEM
unicode-emoji
valid_email
xxhash
bullet_train-api (1.6.7)
bullet_train-api (1.6.18)
bullet_train
bullet_train-super_scaffolding
colorizer
doorkeeper
factory_bot
jbuilder-schema (>= 2.4.0)
jbuilder-schema (= 2.6.2)
pagy
pagy_cursor
rack-cors
rails (>= 6.0.0)
bullet_train-fields (1.6.7)
bullet_train-fields (1.6.18)
chronic
cloudinary
phonelib
rails (>= 6.0.0)
bullet_train-has_uuid (1.6.7)
bullet_train-has_uuid (1.6.18)
rails (>= 6.0.0)
bullet_train-incoming_webhooks (1.6.7)
bullet_train-incoming_webhooks (1.6.18)
bullet_train
bullet_train-api
bullet_train-super_scaffolding
rails (>= 6.0.0)
bullet_train-integrations (1.6.7)
bullet_train-integrations (1.6.18)
rails (>= 6.0.0)
bullet_train-integrations-stripe (1.6.7)
bullet_train-integrations-stripe (1.6.18)
omniauth
omniauth-rails_csrf_protection
omniauth-stripe-connect
rails (>= 6.0.0)
stripe
bullet_train-obfuscates_id (1.6.7)
bullet_train-obfuscates_id (1.6.18)
hashids
rails (>= 6.0.0)
bullet_train-outgoing_webhooks (1.6.7)
bullet_train-outgoing_webhooks (1.6.18)
public_suffix
rails (>= 6.0.0)
bullet_train-roles (1.6.7)
bullet_train-roles (1.6.18)
active_hash
activesupport
cancancan
bullet_train-routes (1.0.0)
rails (>= 6.0.0)
bullet_train-scope_questions (1.6.7)
bullet_train-scope_questions (1.6.18)
rails (>= 6.0.0)
bullet_train-scope_validator (1.6.7)
bullet_train-sortable (1.6.7)
bullet_train-scope_validator (1.6.18)
rails
bullet_train-sortable (1.6.18)
rails (>= 6.0.0)
bullet_train-super_load_and_authorize_resource (1.6.7)
bullet_train-super_load_and_authorize_resource (1.6.18)
cancancan
rails (>= 6.0.0)
bullet_train-super_scaffolding (1.6.7)
bullet_train
bullet_train-super_scaffolding (1.6.18)
colorizer
indefinite_article
masamune-ast (~> 2.0.2)
rails (>= 6.0.0)
bullet_train-themes (1.6.7)
bullet_train-themes (1.6.18)
rails (>= 6.0.0)
bullet_train-themes-light (1.6.7)
bullet_train-themes-light (1.6.18)
bullet_train-themes-tailwind_css
masamune-ast (~> 2.0.2)
rails (>= 6.0.0)
bullet_train-themes-tailwind_css (1.6.7)
bullet_train-themes-tailwind_css (1.6.18)
bullet_train
bullet_train-themes
rails (>= 6.0.0)
cable_ready (5.0.1)
cable_ready (5.0.3)
actionpack (>= 5.2)
actionview (>= 5.2)
activesupport (>= 5.2)
Expand All @@ -214,13 +220,14 @@ GEM
charlock_holmes (0.7.7)
chronic (0.10.2)
chunky_png (1.4.0)
cloudinary (1.27.0)
cloudinary (1.28.0)
aws_cf_signer
rest-client (>= 2.0.0)
code_analyzer (0.5.5)
sexp_processor
coderay (1.1.3)
colorize (1.1.0)
colorizer (0.0.2)
commonmarker (1.0.0.pre10-arm64-darwin)
commonmarker (1.0.0.pre10-x86_64-linux)
concurrent-ruby (1.2.2)
Expand Down Expand Up @@ -250,13 +257,13 @@ GEM
railties (~> 7.0)
rotp (~> 6.0)
docile (1.4.0)
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
domain_name (0.6.20231109)
doorkeeper (5.6.6)
railties (>= 5)
email_reply_parser (0.5.11)
erubi (1.12.0)
erubis (2.7.0)
event_stream_parser (0.3.0)
extended_email_reply_parser (0.5.1)
activesupport
charlock_holmes
Expand All @@ -267,7 +274,7 @@ GEM
factory_bot_rails (6.2.0)
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
faraday (2.7.11)
faraday (2.7.12)
base64
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
Expand Down Expand Up @@ -304,7 +311,7 @@ GEM
jbuilder (2.11.5)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
jbuilder-schema (2.5.0)
jbuilder-schema (2.6.2)
jbuilder
method_source
rails (>= 5.0.0)
Expand Down Expand Up @@ -400,7 +407,7 @@ GEM
omniauth (~> 1.3)
omniauth-oauth2 (~> 1.4)
orm_adapter (0.5.0)
pagy (6.1.0)
pagy (6.2.0)
pagy_cursor (0.6.1)
activerecord (>= 5)
pagy (>= 6, < 7)
Expand All @@ -409,7 +416,7 @@ GEM
ast (~> 2.4.1)
racc
pg (1.5.4)
phonelib (0.8.4)
phonelib (0.8.5)
possessive (1.0.1)
postmark (1.25.0)
json
Expand All @@ -424,7 +431,7 @@ GEM
actionmailer (>= 3)
net-smtp
premailer (~> 1.7, >= 1.7.9)
prism (0.15.1)
prism (0.18.0)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
Expand Down Expand Up @@ -525,7 +532,8 @@ GEM
rubocop-performance (1.19.1)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
ruby-openai (5.1.0)
ruby-openai (6.2.0)
event_stream_parser (>= 0.3.0, < 1.0.0)
faraday (>= 1)
faraday-multipart (>= 1)
ruby-progressbar (1.13.0)
Expand Down Expand Up @@ -586,7 +594,7 @@ GEM
stimulus-rails (1.3.0)
railties (>= 6.0.0)
stringio (3.0.8)
stripe (10.0.0)
stripe (10.1.0)
thor (1.3.0)
thread-local (1.1.0)
timeout (0.4.0)
Expand All @@ -598,12 +606,12 @@ GEM
concurrent-ruby (~> 1.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.8.2)
unf_ext (0.0.9.1)
unicode-display_width (2.5.0)
unicode-emoji (3.4.0)
unicode-version (~> 1.0)
unicode-version (1.3.0)
valid_email (0.1.4)
valid_email (0.2.0)
activemodel
mail (>= 2.6.1)
simpleidn
Expand Down Expand Up @@ -634,24 +642,24 @@ DEPENDENCIES
active_hash
aws-sdk-s3
bootsnap
bullet_train (= 1.6.7)
bullet_train-api (= 1.6.7)
bullet_train-fields (= 1.6.7)
bullet_train-has_uuid (= 1.6.7)
bullet_train-incoming_webhooks (= 1.6.7)
bullet_train-integrations (= 1.6.7)
bullet_train-integrations-stripe (= 1.6.7)
bullet_train-obfuscates_id (= 1.6.7)
bullet_train-outgoing_webhooks (= 1.6.7)
bullet_train-roles (= 1.6.7)
bullet_train-scope_questions (= 1.6.7)
bullet_train-scope_validator (= 1.6.7)
bullet_train-sortable (= 1.6.7)
bullet_train-super_load_and_authorize_resource (= 1.6.7)
bullet_train-super_scaffolding (= 1.6.7)
bullet_train-themes (= 1.6.7)
bullet_train-themes-light (= 1.6.7)
bullet_train-themes-tailwind_css (= 1.6.7)
bullet_train (= 1.6.18)
bullet_train-api (= 1.6.18)
bullet_train-fields (= 1.6.18)
bullet_train-has_uuid (= 1.6.18)
bullet_train-incoming_webhooks (= 1.6.18)
bullet_train-integrations (= 1.6.18)
bullet_train-integrations-stripe (= 1.6.18)
bullet_train-obfuscates_id (= 1.6.18)
bullet_train-outgoing_webhooks (= 1.6.18)
bullet_train-roles (= 1.6.18)
bullet_train-scope_questions (= 1.6.18)
bullet_train-scope_validator (= 1.6.18)
bullet_train-sortable (= 1.6.18)
bullet_train-super_load_and_authorize_resource (= 1.6.18)
bullet_train-super_scaffolding (= 1.6.18)
bullet_train-themes (= 1.6.18)
bullet_train-themes-light (= 1.6.18)
bullet_train-themes-tailwind_css (= 1.6.18)
capybara (~> 3.39)
capybara-email
chronic
Expand All @@ -661,7 +669,7 @@ DEPENDENCIES
debug
devise
devise-two-factor
factory_bot_rails
factory_bot_rails (~> 6.2, != 6.4.0, != 6.3.0)
foreman
honeybadger
jbuilder
Expand Down
2 changes: 2 additions & 0 deletions app/javascript/controllers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { identifierForContextKey } from "stimulus/webpack-helpers"
import { controllerDefinitions as bulletTrainControllers } from "@bullet-train/bullet-train"
import { controllerDefinitions as bulletTrainFieldControllers } from "@bullet-train/fields"
import { controllerDefinitions as bulletTrainSortableControllers } from "@bullet-train/bullet-train-sortable"
import ScrollReveal from 'stimulus-scroll-reveal'
import RevealController from 'stimulus-reveal'
import CableReady from 'cable_ready'
import consumer from '../channels/consumer'
Expand All @@ -25,6 +26,7 @@ application.load(bulletTrainFieldControllers)
application.load(bulletTrainSortableControllers)

application.register('reveal', RevealController)
application.register('scroll-reveal', ScrollReveal)

const controllers = Object.keys(controllersContext).map((filename) => ({
identifier: identifierForContextKey(filename),
Expand Down
Loading

0 comments on commit 5c5385d

Please sign in to comment.