From 516135e3946642d59f4630179b1e1dc96f7680e8 Mon Sep 17 00:00:00 2001 From: Jerome Dalbert Date: Fri, 20 Sep 2024 15:11:23 -0700 Subject: [PATCH] Stop ignoring old `.env.erb` files from Kamal 1 (#53000) `.env.erb` files are not generated any more in new Rails apps, so this commit removes them from the ignore files. Kamal 2 now manages secrets with .kamal/secrets, and this file is meant to be safe for git by default. --- .../lib/rails/generators/rails/app/templates/dockerignore.tt | 3 +-- railties/lib/rails/generators/rails/app/templates/gitignore.tt | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/railties/lib/rails/generators/rails/app/templates/dockerignore.tt b/railties/lib/rails/generators/rails/app/templates/dockerignore.tt index 9c3302751afc8..954a969d36c10 100644 --- a/railties/lib/rails/generators/rails/app/templates/dockerignore.tt +++ b/railties/lib/rails/generators/rails/app/templates/dockerignore.tt @@ -7,9 +7,8 @@ # Ignore bundler config. /.bundle -# Ignore all environment files (except templates). +# Ignore all environment files. /.env* -!/.env*.erb # Ignore all default key files. /config/master.key diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore.tt b/railties/lib/rails/generators/rails/app/templates/gitignore.tt index cb6dea0e9976d..a071c05a2c1c4 100644 --- a/railties/lib/rails/generators/rails/app/templates/gitignore.tt +++ b/railties/lib/rails/generators/rails/app/templates/gitignore.tt @@ -7,9 +7,8 @@ # Ignore bundler config. /.bundle -# Ignore all environment files (except templates). +# Ignore all environment files. /.env* -!/.env*.erb # Ignore all logfiles and tempfiles. /log/*