aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrendan Forster <brendan@github.com>2016-08-09 08:35:46 +1000
committerGitHub <noreply@github.com>2016-08-09 08:35:46 +1000
commit2664dad61f3fda7755acc70ceb5aac4b1e956981 (patch)
tree60dfc5937fcbf56664a224d32927e845b20ae3d5
parente7c4964074654139df734adafad7770fa59b72fe (diff)
parentcedd263b832e6f287e827e5b7bf159cd4cb36e14 (diff)
downloadgitignore-2664dad61f3fda7755acc70ceb5aac4b1e956981.tar.gz
gitignore-2664dad61f3fda7755acc70ceb5aac4b1e956981.zip
Merge pull request #2051 from sdhull/patch-1
Remove config/secrets.yml
-rw-r--r--Rails.gitignore6
1 files changed, 4 insertions, 2 deletions
diff --git a/Rails.gitignore b/Rails.gitignore
index d8c256c1..e9742760 100644
--- a/Rails.gitignore
+++ b/Rails.gitignore
@@ -12,9 +12,11 @@ capybara-*.html
rerun.txt
pickle-email-*.html
-# TODO Comment out these rules if you are OK with secrets being uploaded to the repo
+# TODO Comment out this rule if you are OK with secrets being uploaded to the repo
config/initializers/secret_token.rb
-config/secrets.yml
+
+# Only include if you have production secrets in this file, which is no longer a Rails default
+# config/secrets.yml
# dotenv
# TODO Comment out this rule if environment variables can be committed