From 1c09c21a97f9b48a26047be71486087e5879d797 Mon Sep 17 00:00:00 2001 From: Ruben Davila Date: Fri, 27 May 2016 20:29:38 -0500 Subject: [PATCH 1/2] Ignore files under "/shared" directory and not other subdirectories that contains that name It's working fine now but by making it more explicit we can make tools like 'The Silver Searcher' to parse properly the .gitignore file --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8f861d76a3..65eca9e200 100644 --- a/.gitignore +++ b/.gitignore @@ -46,4 +46,4 @@ rails_best_practices_output.html tmp/ vendor/bundle/* builds/* -shared/* +/shared/* From f0930feac9329a047e5b95f7d6e2d338d9b786c4 Mon Sep 17 00:00:00 2001 From: Ruben Davila Date: Sun, 29 May 2016 16:51:48 -0500 Subject: [PATCH 2/2] Use absolute paths wherever is possible for .gitignore entries. --- .gitignore | 76 +++++++++++++++++++++++++++--------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index 65eca9e200..ce6a363fe3 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/* +/tmp/* +/vendor/bundle/* +/builds/* /shared/*