Commit 71f7bd6b authored by Robert Speicher's avatar Robert Speicher

Merge branch 'fix-tmp-gitignore' into 'master'

Fix Git ignore rules for tmp/, shared/, and plugins/

See merge request gitlab-org/gitlab-ce!32589
parents 18b4c66d 55063f85
...@@ -61,11 +61,9 @@ eslint-report.html ...@@ -61,11 +61,9 @@ eslint-report.html
/shared/artifacts/ /shared/artifacts/
/rails_best_practices_output.html /rails_best_practices_output.html
/tags /tags
/tmp/*
/vendor/bundle/* /vendor/bundle/*
/vendor/gitaly-ruby /vendor/gitaly-ruby
/builds* /builds*
/shared/*
/.gitlab_workhorse_secret /.gitlab_workhorse_secret
/webpack-report/ /webpack-report/
/knapsack/ /knapsack/
...@@ -73,7 +71,6 @@ eslint-report.html ...@@ -73,7 +71,6 @@ eslint-report.html
/locale/**/LC_MESSAGES /locale/**/LC_MESSAGES
/locale/**/*.time_stamp /locale/**/*.time_stamp
/.rspec /.rspec
/plugins/*
/.gitlab_pages_secret /.gitlab_pages_secret
/.gitlab_smime_key /.gitlab_smime_key
/.gitlab_smime_cert /.gitlab_smime_cert
......
*
!*/
!.gitignore
!.gitkeep
!examples/*
*
!*/
!.gitignore
!.gitkeep
*
!*/
!.gitignore
!.gitkeep
/tests/
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment