summaryrefslogtreecommitdiffstats
path: root/options/gitignore/Rails
diff options
context:
space:
mode:
authorThomas Boerger <thomas@webhippie.de>2017-03-15 13:30:00 +0100
committerGitHub <noreply@github.com>2017-03-15 13:30:00 +0100
commita06c3ad2c02a5473184711be6dbf1b30f0299e11 (patch)
treece0ac065a6afa843ce298d00d1761b5cf48accf9 /options/gitignore/Rails
parent09fe4a2ae9dfa8b3bc8a5039d0feab1e1a34d07b (diff)
downloadgitea-a06c3ad2c02a5473184711be6dbf1b30f0299e11.tar.gz
gitea-a06c3ad2c02a5473184711be6dbf1b30f0299e11.zip
Synced gitignores with github repo (#1245)
* Renamed scripts directory into contrib * Added script to download gitignores from github * Synced gitignores with github repo
Diffstat (limited to 'options/gitignore/Rails')
-rw-r--r--options/gitignore/Rails17
1 files changed, 13 insertions, 4 deletions
diff --git a/options/gitignore/Rails b/options/gitignore/Rails
index f786a90af3..e97427608c 100644
--- a/options/gitignore/Rails
+++ b/options/gitignore/Rails
@@ -12,15 +12,21 @@ 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
-## Environment normalisation:
+# 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
+.env
+
+## Environment normalization:
/.bundle
/vendor/bundle
-# these should all be checked in to normalise the environment:
+# these should all be checked in to normalize the environment:
# Gemfile.lock, .ruby-version, .ruby-gemset
# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
@@ -33,3 +39,6 @@ bower.json
# Ignore pow environment settings
.powenv
+
+# Ignore Byebug command history file.
+.byebug_history