summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore8
1 files changed, 6 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 3aa8fc7..f898d47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,13 @@
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+# git config --global core.excludesfile '~/.gitignore_global'
+
# Ignore bundler config
/.bundle
-bin
# Ignore the default SQLite database.
/db/*.sqlite3
+/db/*.sqlite3-journal
# Ignore all logfiles and tempfiles.
/log/*.log
@@ -12,7 +16,6 @@ bin
/pkg
/*/pkg
/log
-.*.swp
*/Gemfile.lock
test/dummy/log/*
test/dummy/tmp/*
@@ -31,6 +34,7 @@ public/ca.crt
public/config/*
public/provider.json
config/config.yml
+config/secrets.yml
public/1/*
vendor/bundle/*
public/img