summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-08-26 17:47:18 -0700
committerDouwe Maan <douwe@gitlab.com>2015-08-26 17:47:18 -0700
commit6afd69f4445cc0688aa1695389eb3f79033e3121 (patch)
tree729b58c8a0a7013e4166dca05e2e68adfe274a1d /.gitignore
parent046b28312704f3131e72dcd2dbdacc5264d4aa62 (diff)
downloadgitlab-ce-6afd69f4445cc0688aa1695389eb3f79033e3121.tar.gz
Update gitignore, change literal DB table names, fix errors, fix fontawesome
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 8a68bb3e4f0..aff8ad9ecbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,12 +20,14 @@ backups/*
config/aws.yml
config/database.yml
config/gitlab.yml
+config/gitlab_ci.yml
config/initializers/omniauth.rb
config/initializers/rack_attack.rb
config/initializers/smtp_settings.rb
config/resque.yml
config/unicorn.rb
config/mail_room.yml
+config/secrets.yml
coverage/*
db/*.sqlite3
db/*.sqlite3-journal
@@ -41,3 +43,4 @@ rails_best_practices_output.html
/tags
tmp/
vendor/bundle/*
+/ci/builds/*