diff options
author | Robert Speicher <robert@gitlab.com> | 2016-05-29 23:04:30 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-05-29 23:04:30 +0000 |
commit | c84ec18fcc78e8b99d2ac2bb6bb05209b5bb8872 (patch) | |
tree | a97b8f0dd7b447d4e430664c453d85becfc6d30e | |
parent | 32b9276c25c95e2bb9fb7805b4457fdd948ea08e (diff) | |
parent | f0930feac9329a047e5b95f7d6e2d338d9b786c4 (diff) | |
download | gitlab-ce-c84ec18fcc78e8b99d2ac2bb6bb05209b5bb8872.tar.gz |
Merge branch 'update_gitignore' into 'master'
Use absolute paths in .gitignore
See merge request !4335
-rw-r--r-- | .gitignore | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/.gitignore b/.gitignore index 8f861d76a37..ce6a363fe35 100644 --- a/.gitignore +++ b/.gitignore @@ -4,46 +4,46 @@ .bundle .chef .directory -.envrc -.gitlab_shell_secret +/.envrc +/.gitlab_shell_secret .idea -.rbenv-version +/.rbenv-version .rbx/ -.ruby-gemset -.ruby-version -.rvmrc +/.ruby-gemset +/.ruby-version +/.rvmrc .sass-cache/ -.secret -.vagrant -.byebug_history -Vagrantfile -backups/* -config/aws.yml -config/database.yml -config/gitlab.yml -config/gitlab_ci.yml -config/initializers/rack_attack.rb -config/initializers/smtp_settings.rb -config/initializers/relative_url.rb -config/resque.yml -config/unicorn.rb -config/secrets.yml -config/sidekiq.yml -coverage/* -db/*.sqlite3 -db/*.sqlite3-journal -db/data.yml -doc/code/* -dump.rdb -log/*.log* -nohup.out -public/assets/ -public/uploads.* -public/uploads/ -shared/artifacts/ -rails_best_practices_output.html +/.secret +/.vagrant +/.byebug_history +/Vagrantfile +/backups/* +/config/aws.yml +/config/database.yml +/config/gitlab.yml +/config/gitlab_ci.yml +/config/initializers/rack_attack.rb +/config/initializers/smtp_settings.rb +/config/initializers/relative_url.rb +/config/resque.yml +/config/unicorn.rb +/config/secrets.yml +/config/sidekiq.yml +/coverage/* +/db/*.sqlite3 +/db/*.sqlite3-journal +/db/data.yml +/doc/code/* +/dump.rdb +/log/*.log* +/nohup.out +/public/assets/ +/public/uploads.* +/public/uploads/ +/shared/artifacts/ +/rails_best_practices_output.html /tags -tmp/ -vendor/bundle/* -builds/* -shared/* +/tmp/* +/vendor/bundle/* +/builds/* +/shared/* |