Skip to content

Commit 8418205

Browse files
committed
Merge branch 'main' into recursiveautosaves
* main: (299 commits) (docs): Fix wrong output of variable in Action View Helpers guide Add credentials:fetch command Remove `ActiveJob::ConfiguredJob#perform_all_later` method Fix typo in Sign Up and Settings Guide Fix outdated api.rubyonrails.org links in Testing Guide [ci skip] Fix outdated link in error message about missing MIME type Fix ActiveSupport::Rescuable not to be coupled with ActionController Allow to use either `:unprocessable_entity` or `:unprocessable_content` Handle Rack 3.2 `unprocessable_{entity,content}` Log when rescue_from handles an exception Fix tutorials link [RF-DOCS] Sign up guide (rails#55254) Fix typo in Actionpack Changelog Allow hosts redirects from `hosts` Rails configuration Refactor HashWithIndifferentAccess not to rely on tap as much Fix `HWIA#transform_keys!` removing defaults rate_limit notification instrumentation to include more payload Clarification about instance-level methods defined by cattr_accessor [Fix rails#55379] Default branch in github ci templates Add `relative_time_in_words` helper to ActionView ...
2 parents 9ce56b6 + b920c7a commit 8418205

File tree

461 files changed

+12309
-16353
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

461 files changed

+12309
-16353
lines changed

.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.191.1/containers/ruby/.devcontainer/base.Dockerfile
22

33
# [Choice] Ruby version: 3.4, 3.3, 3.2
4-
ARG VARIANT="3.4.2"
4+
ARG VARIANT="3.4.5"
55
FROM ghcr.io/rails/devcontainer/images/ruby:${VARIANT}
66

77
RUN sudo apt-get update && export DEBIAN_FRONTEND=noninteractive \
@@ -34,5 +34,5 @@ COPY tools/releaser/releaser.gemspec /tmp/rails/tools/releaser/
3434
RUN sudo chown -R vscode:vscode /tmp/rails
3535
USER vscode
3636
RUN cd /tmp/rails \
37-
&& /home/vscode/.rbenv/shims/bundle install \
37+
&& bash -i -c 'bundle install' \
3838
&& rm -rf /tmp/rails

.devcontainer/compose.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212

1313
depends_on:
1414
- postgres
15-
- mariadb
15+
- mysql
1616
- redis
1717
- memcached
1818

@@ -32,13 +32,13 @@ services:
3232
POSTGRES_DB: postgres
3333
POSTGRES_PASSWORD: postgres
3434

35-
mariadb:
36-
image: mariadb:lts
35+
mysql:
36+
image: mysql:latest
3737
restart: unless-stopped
3838
volumes:
39-
- mariadb-data:/var/lib/mysql
39+
- mysql-data:/var/lib/mysql
4040
environment:
41-
MARIADB_ROOT_PASSWORD: root
41+
MYSQL_ROOT_PASSWORD: root
4242

4343
redis:
4444
image: valkey/valkey:8
@@ -53,5 +53,5 @@ services:
5353

5454
volumes:
5555
postgres-data:
56-
mariadb-data:
56+
mysql-data:
5757
redis-data:

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"ghcr.io/devcontainers/features/node:1": {
1414
"version": "latest"
1515
},
16-
"ghcr.io/rails/devcontainer/features/postgres-client:1.1.1": {
16+
"ghcr.io/rails/devcontainer/features/postgres-client:1.1.3": {
1717
"version": "17"
1818
}
1919
},
@@ -22,7 +22,7 @@
2222
"PGHOST": "postgres",
2323
"PGUSER": "postgres",
2424
"PGPASSWORD": "postgres",
25-
"MYSQL_HOST": "mariadb",
25+
"MYSQL_HOST": "mysql",
2626
"REDIS_URL": "redis://redis/0",
2727
"MEMCACHE_SERVERS": "memcached:11211"
2828
},

.github/workflows/devcontainer-smoke-test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: actions/checkout@v4
1919

2020
- name: Login to GitHub Container Registry
21-
uses: docker/login-action@v3
21+
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
2222
with:
2323
registry: ghcr.io
2424
username: ${{ github.repository_owner }}
@@ -34,7 +34,7 @@ jobs:
3434
run: bundle exec railties/exe/rails new myapp_sqlite --database="sqlite3" --dev --devcontainer
3535

3636
- name: Test devcontainer sqlite3
37-
uses: devcontainers/[email protected]
37+
uses: devcontainers/ci@8bf61b26e9c3a98f69cb6ce2f88d24ff59b785c6 # v0.3.1900000417
3838
with:
3939
subFolder: myapp_sqlite
4040
imageName: ghcr.io/rails/smoke-test-devcontainer
@@ -51,7 +51,7 @@ jobs:
5151
run: bundle exec railties/exe/rails new myapp_postgresql --database="postgresql" --dev --devcontainer
5252

5353
- name: Test devcontainer postgresql
54-
uses: devcontainers/[email protected]
54+
uses: devcontainers/ci@8bf61b26e9c3a98f69cb6ce2f88d24ff59b785c6 # v0.3.1900000417
5555
with:
5656
subFolder: myapp_postgresql
5757
imageName: ghcr.io/rails/smoke-test-devcontainer
@@ -68,7 +68,7 @@ jobs:
6868
run: bundle exec railties/exe/rails new myapp_mysql --database="mysql" --dev --devcontainer
6969

7070
- name: Test devcontainer mysql
71-
uses: devcontainers/[email protected]
71+
uses: devcontainers/ci@8bf61b26e9c3a98f69cb6ce2f88d24ff59b785c6 # v0.3.1900000417
7272
with:
7373
subFolder: myapp_mysql
7474
imageName: ghcr.io/rails/smoke-test-devcontainer
@@ -85,7 +85,7 @@ jobs:
8585
run: bundle exec railties/exe/rails new myapp_trilogy --database="trilogy" --dev --devcontainer
8686

8787
- name: Test devcontainer trilogy
88-
uses: devcontainers/[email protected]
88+
uses: devcontainers/ci@8bf61b26e9c3a98f69cb6ce2f88d24ff59b785c6 # v0.3.1900000417
8989
with:
9090
subFolder: myapp_trilogy
9191
imageName: ghcr.io/rails/smoke-test-devcontainer

.github/workflows/rails-new-docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Test container
4242
run: ruby -r ./.github/workflows/scripts/test-container.rb
4343

44-
- uses: zzak/action-discord@v8
44+
- uses: zzak/action-discord@4cd181470664aa174b7252e5afb2ecf896001817 # v8
4545
continue-on-error: true
4646
if: failure() && github.ref_name == 'main'
4747
with:

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ gem "useragent", require: false
100100
group :job do
101101
gem "resque", require: false
102102
gem "resque-scheduler", require: false
103-
gem "sidekiq", require: false
103+
gem "sidekiq", "!= 8.0.3", require: false
104104
gem "sucker_punch", require: false
105105
gem "queue_classic", ">= 4.0.0", require: false, platforms: :ruby
106106
gem "sneakers", require: false

0 commit comments

Comments
 (0)