Skip to content

Commit

Permalink
Merge tag 'v1.7.9'
Browse files Browse the repository at this point in the history
# Conflicts:
#	Gemfile.lock
  • Loading branch information
jagthedrummer committed May 29, 2024
2 parents 75283ed + e1e6daa commit 8462acb
Show file tree
Hide file tree
Showing 17 changed files with 5,661 additions and 3,725 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ aliases:
paths:
- node_modules
- &ruby_node_browsers_docker_image
- image: cimg/ruby:3.3.0-browsers
- image: cimg/ruby:3.3.1-browsers
environment:
PGHOST: localhost
PGUSER: untitled_application
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/_run_super_scaffolding_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ jobs:
working-directory: tmp/starter
bundler-cache: true

- name: Enable corepack
run: corepack enable

- uses: actions/setup-node@v3
with:
node-version-file: tmp/starter/.nvmrc
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/_run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ jobs:
working-directory: tmp/starter
bundler-cache: true

- name: Enable corepack
run: corepack enable

- uses: actions/setup-node@v3
with:
node-version-file: tmp/starter/.nvmrc
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/version-bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ jobs:
with:
bundler-cache: true

- name: Enable corepack
run: corepack enable

- uses: "actions/setup-node@v3"
with:
node-version: '20.x'
Expand Down
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,16 @@ yarn-debug.log*
.yarn-integrity
.yalc
yalc.lock
.yarn/

# The non-zero-installs set of ignores for yarn.
# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

# 🚅 this is bullet train's list of files to ignore.
# please add yours at the end of the file.
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.11.1
20.12.2
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.0
3.3.1
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ gem "cssbundling-rails"
gem "jbuilder"

# Use Redis adapter to run Action Cable in production
gem "redis", "~> 5.1.0"
gem "redis", "~> 5.2.0"

# Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
# gem "kredis"
Expand Down Expand Up @@ -112,7 +112,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.7.1"
BULLET_TRAIN_VERSION = "1.7.9"

# Core packages.
gem "bullet_train", BULLET_TRAIN_VERSION
Expand Down
Loading

0 comments on commit 8462acb

Please sign in to comment.