Merge branch 'main' into support_unencrypted_data-true

Author: ghiculescu

.devcontainer/Dockerfile

@@ -1,31 +1,15 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.191.1/containers/ruby/.devcontainer/base.Dockerfile
 
-# [Choice] Ruby version: 3, 3.3, 3.2, 3.1, 3.0, 2, 2.7, 2.6
-ARG VARIANT="3.3"
-FROM mcr.microsoft.com/devcontainers/ruby:${VARIANT}
+# [Choice] Ruby version: 3.4, 3.3, 3.2
+ARG VARIANT="3.4.2"
+FROM ghcr.io/rails/devcontainer/images/ruby:${VARIANT}
 
-# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
-ARG NODE_VERSION="lts/*"
-RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
-
-# [Optional] Uncomment this section to install additional OS packages.
-RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends \
+RUN sudo apt-get update && export DEBIAN_FRONTEND=noninteractive \
+    && sudo apt-get -y install --no-install-recommends \
         mariadb-client libmariadb-dev \
         postgresql-client postgresql-contrib libpq-dev \
-        ffmpeg mupdf mupdf-tools libvips poppler-utils
-
-
-ARG IMAGEMAGICK_VERSION="7.1.0-5"
-RUN wget -qO /tmp/im.tar.xz https://imagemagick.org/archive/releases/ImageMagick-$IMAGEMAGICK_VERSION.tar.xz \
-    && wget -qO /tmp/im.sig https://imagemagick.org/archive/releases/ImageMagick-$IMAGEMAGICK_VERSION.tar.xz.asc \
-    && gpg --batch --keyserver keyserver.ubuntu.com --recv 89AB63D48277377A \
-    && gpg --batch --verify /tmp/im.sig /tmp/im.tar.xz \
-    && tar xJf /tmp/im.tar.xz -C /tmp \
-    && cd /tmp/ImageMagick-$IMAGEMAGICK_VERSION \
-    && ./configure --with-rsvg && make -j 9 && make install \
-    && ldconfig /usr/local/lib \
-    && rm -rf /tmp/*
+        ffmpeg mupdf mupdf-tools libvips-dev poppler-utils \
+        libxml2-dev sqlite3 imagemagick
 
 # Add the Rails main Gemfile and install the gems. This means the gem install can be done
 # during build instead of on start. When a fork or branch has different gems, we still have an
@@ -44,8 +28,11 @@ COPY activerecord/activerecord.gemspec /tmp/rails/activerecord/
 COPY activestorage/activestorage.gemspec /tmp/rails/activestorage/
 COPY activesupport/activesupport.gemspec /tmp/rails/activesupport/
 COPY railties/railties.gemspec /tmp/rails/railties/
+COPY tools/releaser/releaser.gemspec /tmp/rails/tools/releaser/
+# Docker does not support COPY as users other than root. So we need to chown this dir so we
+# can bundle as vscode user and then remove the tmp dir
+RUN sudo chown -R vscode:vscode /tmp/rails
+USER vscode
 RUN cd /tmp/rails \
-    && bundle install \
-    && yarn install \
+    && /home/vscode/.rbenv/shims/bundle install \
     && rm -rf /tmp/rails
-RUN chown -R vscode:vscode /usr/local/rvm

.devcontainer/boot.sh

@@ -1,12 +1,18 @@
+#!/bin/sh
+
+bundle update --bundler
 bundle install
-yarn install
 
-sudo chown -R vscode:vscode /usr/local/bundle
+if [ -n "${NVM_DIR}" ]; then
+  # shellcheck disable=SC1091
+  . "${NVM_DIR}/nvm.sh" && nvm install --lts
+  yarn install
+fi
 
-cd activerecord
+cd activerecord || { echo "activerecord directory doesn't exist"; exit; }
 
 # Create PostgreSQL databases
 bundle exec rake db:postgresql:rebuild
 
 # Create MySQL databases
-MYSQL_CODESPACES=1 bundle exec rake db:mysql:rebuild
+bundle exec rake db:mysql:rebuild

.devcontainer/compose.yaml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   rails:
     build:
@@ -12,24 +10,21 @@ services:
     # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity
 
-    # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
-    networks:
-      - default
-
     depends_on:
       - postgres
       - mariadb
       - redis
       - memcached
 
+    environment:
+      MYSQL_CODESPACES: "1"
+
     # Use "forwardPorts" in **devcontainer.json** to forward an app port locally.
     # (Adding the "ports" property to this file will not forward from a Codespace.)
 
   postgres:
     image: postgres:latest
     restart: unless-stopped
-    networks:
-      - default
     volumes:
       - postgres-data:/var/lib/postgresql/data
     environment:
@@ -38,32 +33,23 @@ services:
       POSTGRES_PASSWORD: postgres
 
   mariadb:
-    image: mariadb:latest
+    image: mariadb:lts
     restart: unless-stopped
-    networks:
-      - default
     volumes:
       - mariadb-data:/var/lib/mysql
     environment:
       MARIADB_ROOT_PASSWORD: root
 
   redis:
-    image: redis:latest
+    image: valkey/valkey:8
     restart: unless-stopped
-    networks:
-      - default
     volumes:
       - redis-data:/data
 
   memcached:
     image: memcached:latest
     restart: unless-stopped
     command: ["-m", "1024"]
-    networks:
-      - default
-
-networks:
-  default:
 
 volumes:
   postgres-data:

.devcontainer/devcontainer.json

@@ -1,4 +1,4 @@
-// For format details, see https://aka.ms/devcontainer.json.
+// For format details, see https://containers.dev/implementors/json_reference/.
 {
 	"name": "Rails project development",
 	"dockerComposeFile": "compose.yaml",
@@ -9,6 +9,12 @@
 	"features": {
 		"ghcr.io/devcontainers/features/github-cli:1": {
 			"version": "latest"
+		},
+		"ghcr.io/devcontainers/features/node:1": {
+			"version": "latest"
+		},
+		"ghcr.io/rails/devcontainer/features/postgres-client:1.1.1": {
+			"version": "17"
 		}
 	},
 
@@ -36,8 +42,8 @@
 				"Shopify.ruby-lsp"
 			]
 		}
-	},
+	}
 
-	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// Uncomment to connect as root instead. More info: https://containers.dev/implementors/json_reference/#remoteUser.
 	// "remoteUser": "root"
 }

.git-blame-ignore-revs

@@ -0,0 +1,86 @@
+# Changes that are cosmetic and do not add anything substantial
+# to the stability, functionality, or testability of Rails will
+# generally not be accepted. Read more about our rationale behind
+# this decision: https://github.com/rails/rails/pull/13771#issuecomment-32746700
+
+# normalizes indentation and whitespace across the project
+80e66cc4d90bf8c15d1a5f6e3152e90147f00772
+# applies new string literal convention in *
+adca8154c6ffce978a5dbc514273cceecbb15f8e
+9ed740449884ba5841f756c4a5ccc0bce8f19082
+92e2d16a3c75d549fcd9422a31acd3323b74abaa
+78d3f84955bccad0ab161c5f2b4c1133813161a3
+6b3719b7577ab81171bab94a0492ae383dd279fe
+8b4e6bf23338e2080af537ea4f295e65a1d11388
+783763bde97bea3d0c200038453008a8cfff1e88
+69ab3eb57e8387b0dd9d672b5e8d9185395baa03
+f8477f13bfe554064bd25a57e5289b4ebaabb504
+b678eb57e93423ac8e2a0cc0b083ce556c6fb130
+b91ff557ef6f621d1b921f358fd5b8a5d9e9090e
+c3e7abddfb759eecb30cd59f27103fda4c4827dc
+35b3de8021e68649cac963bd82a74cc75d1f60f0
+628e51ff109334223094e30ad1365188bbd7f9c6
+4b6c68dfb810c836f87587a16353317d1a180805
+66a7cfa91045e05f134efc9ac0e226e66161e2e6
+bde6547bb6a8ddf18fb687bf20893d3dc87e0358
+93c9534c9871d4adad4bc33b5edc355672b59c61
+4c208254573c3428d82bd8744860bd86e1c78acb
+18a2513729ab90b04b1c86963e7d5b9213270c81
+9617db2078e8a85c8944392c21dd748f932bbd80
+4df2b779ddfcb27761c71e00e2b241bfa06a0950
+a731125f12c5834de7eae3455fad63ea4d348034
+d66e7835bea9505f7003e5038aa19b6ea95ceea1
+e6ab70c439301d533f14b3387ee181d843a86b30
+# modernizes hash syntax in *
+1607ee299d15c133b2b63dcfc840eddfba7e525b
+477568ee33bee0dc5e57b9df624142296e3951a4
+5c315a8fa6296904f5e0ba8da919fc395548cf98
+d22e522179c1c90e658c3ed0e9b972ec62306209
+fa911a74e15ef34bb435812f7d9cf7324253476f
+301ce2a6d11bc7a016f7ede71e3c6fd9fa0693a3
+63fff600accb41b56a3e6ac403d9b1732de3086d
+5b6eb1d58b48fada298215b2cccda89f993890c3
+12a70404cd164008879e63cc320356e6afee3adc
+60b67d76dc1d98e4269aac7705e9d8323eb42942
+# [Tests only] Enable Minitest/AssertPredicate rule
+19f8ab2e7d60dcdfd7664d6bea3a9fae55a3618c
+# Standardize nodoc comments
+18707ab17fa492eb25ad2e8f9818a320dc20b823
+# Add Style/RedundantFreeze to remove redudant .freeze
+aa3dcabd874a3e82e455e85a1c94a7abaac2900a
+# Enable Performance/UnfreezeString cop
+1b86d90136efb98c7b331a84ca163587307a49af
+# Arel: rubocop -a
+4c0a3d48804a363c7e9272519665a21f601b5248
+# Add more rubocop rules about whitespaces
+fe1f4b2ad56f010a4e9b93d547d63a15953d9dc2
+# Add three new rubocop rules
+55f9b8129a50206513264824abb44088230793c2
+# applies remaining conventions across the project
+b326e82dc012d81e9698cb1f402502af1788c1e9
+# remove redundant curlies from hash arguments
+411ccbdab2608c62aabdb320d52cb02d446bb39c
+# Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} ;)
+b95d6e84b00bd926b1118f6a820eca7a870b8c35
+b451de0d6de4df6bc66b274cec73b919f823d5ae
+# Replace assert ! with assert_not
+a1ac18671a90869ef81d02f2eafe8104e4eea34f
+# Use respond_to test helpers
+0d50cae996c51630361e8514e1f168b0c48957e1
+#  Change refute to assert_not
+211adb47e76b358ea15a3f756431c042ab231c23
+# Use assert_predicate and assert_not_predicate
+94333a4c31bd10c1f358c538a167e6a4589bae2d
+# Use assert_empty and assert_not_empty
+82c39e1a0b5114e2d89a80883a41090567a83196
+# Remove extra whitespace
+fda1863e1a8c120294c56482631d8254ad6125ff
+# Reduce string objects by using \ instead of + or << for concatenating strings
+b70fc698e157f2a768ba42efac08c08f4786b01c
+# Hash Syntax to 1.9 related changes
+eebb9ddf9ba559a510975c486fe59a4edc9da97d
+be4a4cd38ff2c2db0f6b69bb72fb3557bd5a6e21
+d20a52930aa80d7f219465d6fc414a68b16ef2a8
+3c580182ff3c16d2247aabc85100bf8c6edb0f82
+5ad7f8ab418f0c760dbb584f7c78d94ce32e9ee3
+a2c843885470dddbad9430963190464a22167921

.github/issue_template.md renamed to .github/ISSUE_TEMPLATE/bug_report.md

@@ -1,4 +1,10 @@
+---
+name: Bug report
+about: Report an issue with Rails you've discovered
+---
+
 ### Steps to reproduce
+
 <!-- (Guidelines for creating a bug report are [available
 here](https://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#creating-a-bug-report)) -->
 
@@ -8,12 +14,15 @@ here](https://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#crea
 ```
 
 ### Expected behavior
+
 <!-- Tell us what should happen -->
 
 ### Actual behavior
+
 <!-- Tell us what happens instead -->
 
 ### System configuration
-**Rails version**:
 
-**Ruby version**:
+**Rails version**: 
+
+**Ruby version**: 

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/pull_request_template.md

@@ -14,7 +14,7 @@ here](https://edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html#cont
 About this template
 
 The following template aims to help contributors write a good description for their pull requests.
-We'd like you to provide a description of the changes in your pull request (i.e. bugs fixed or features added), motivation behind the changes, and complete the checklist below before opening a pull request.
+We'd like you to provide a description of the changes in your pull request (i.e. bugs fixed or features added), the motivation behind the changes, and complete the checklist below before opening a pull request.
 
 Feel free to discard it if you need to (e.g. when you just fix a typo). -->
 
@@ -33,13 +33,13 @@ This Pull Request changes [REPLACE ME]
 
 ### Additional information
 
-<!-- Provide additional information such as benchmarks, reference to other repositories or alternative solutions. -->
+<!-- Provide additional information such as benchmarks, references to other repositories, or alternative solutions. -->
 
 ### Checklist
 
 Before submitting the PR make sure the following are checked:
 
-* [ ] This Pull Request is related to one change. Changes that are unrelated should be opened in separate PRs.
+* [ ] This Pull Request is related to one change. Unrelated changes should be opened in separate PRs.
 * [ ] Commit message has a detailed description of what changed and why. If this PR fixes a related issue include it in the commit message. Ex: `[Fix #issue-number]`
 * [ ] Tests are added or updated if you fix a bug or add a feature.
 * [ ] CHANGELOG files are updated for the changed libraries if there is a behavior change or additional feature. Minor bug fixes and documentation changes should not be included.

.github/stale.yml

@@ -20,7 +20,7 @@ markComment: >
 
   The resources of the Rails team are limited, and so we are asking for your help.
 
-  If you can still reproduce this error on the `7-1-stable` branch or on `main`,
+  If you can still reproduce this error on the `8-0-stable` branch or on `main`,
   please reply with all of the information you have about it in order to keep the issue open.
 
   Thank you for all your contributions.

.github/workflows/devcontainer-shellcheck.yml

@@ -0,0 +1,24 @@
+name: Devcontainer Shellcheck
+
+on:
+  pull_request:
+    paths:
+      - ".devcontainer/**/*.sh"
+  push:
+    paths:
+      - ".devcontainer/**/*.sh"
+
+permissions:
+  contents: read
+
+jobs:
+  devcontainer_shellcheck:
+    name: Devcontainer Shellcheck
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout (GitHub)
+        uses: actions/checkout@v4
+
+      - name: Lint Devcontainer Scripts
+        run: |
+          find .devcontainer/ -name '*.sh' -print0 | xargs -0 shellcheck