summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorNavaL <ayoyo@thoughtworks.com>2016-07-14 15:44:07 +0200
committerNavaL <ayoyo@thoughtworks.com>2016-07-14 15:44:07 +0200
commite3c2cb91dfef5c39c608b967e702e9de977d1bd2 (patch)
tree154dc28dd986bd6e0a48e933c5da46994ffaa0cb /.gitignore
parente2f19bcfb6dbce77746c2d61715340525b29a592 (diff)
parentf09e6ec1337962ab279f021a6a6d0ff30479ebe0 (diff)
Merge branch 'develop' of https://github.com/leapcode/leap_web into feature/expose_admin_in_api
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore7
1 files changed, 5 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 3aa8fc7..8d49deb 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/*