summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2014-02-06 10:10:35 -0800
committerjessib <jessib@riseup.net>2014-02-06 10:10:35 -0800
commit2fc1435ed54625986211c2219b587679e33fce15 (patch)
tree43a52eb7ad17be73d9cbabd831b768d3fc6be20f /.gitignore
parentc32b55caa141d02dab65df16bc3f2149c04603e5 (diff)
parent7a1085176ff49113f4920810045c6ef8b2bf130c (diff)
Merge pull request #136 from azul/cleanup/no-untracked-files
make sure all untracked files in deploy are in gitignore - #4953
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore8
1 files changed, 6 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index f65233f..fef9aa2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
# Ignore bundler config
/.bundle
+bin
# Ignore the default SQLite database.
/db/*.sqlite3
@@ -17,18 +18,21 @@
/pkg
/*/pkg
/log
+.*.swp
*/Gemfile.lock
test/dummy/log/*
test/dummy/tmp/*
+
+# ignore all deploy specific configuration
config/couchdb.yml
public/assets/*
public/ca.crt
public/config/*
public/provider.json
config/config.yml
-bin
-.*.swp
public/1/*
vendor/bundle/*
public/img
config/couchdb.yml.*
+config/provider
+config/customization