diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-06 13:06:01 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-06 13:06:01 +0100 |
| commit | c0849101e6d79bed12c830986c7ff63b2e2f3d9e (patch) | |
| tree | 23338ba74654a5cd8b75adc21921f5cd6621b459 /.gitignore | |
| parent | 097faeb481db2a4956b41049c041d55f5da4e2c1 (diff) | |
| parent | 95b1adb3394851132ea7ecb3104e9a857bdad82f (diff) | |
| download | gitlab-ce-c0849101e6d79bed12c830986c7ff63b2e2f3d9e.tar.gz | |
Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-unchecked
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index f5b6427ca03..91ea81bfc4e 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ config/initializers/smtp_settings.rb config/resque.yml config/unicorn.rb config/secrets.yml +config/sidekiq.yml coverage/* db/*.sqlite3 db/*.sqlite3-journal |