aboutsummaryrefslogtreecommitdiffstats
path: root/Rails.gitignore
diff options
context:
space:
mode:
Diffstat (limited to 'Rails.gitignore')
-rw-r--r--Rails.gitignore7
1 files changed, 5 insertions, 2 deletions
diff --git a/Rails.gitignore b/Rails.gitignore
index 8671a447..55fcde6c 100644
--- a/Rails.gitignore
+++ b/Rails.gitignore
@@ -16,11 +16,11 @@ pickle-email-*.html
config/initializers/secret_token.rb
config/secrets.yml
-## Environment normalisation:
+## 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:
@@ -30,3 +30,6 @@ config/secrets.yml
/vendor/assets/bower_components
*.bowerrc
bower.json
+
+# Ignore pow environment settings
+.powenv