diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-09-05 20:54:49 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-09-05 20:54:49 +0000 |
| commit | 71f7bd6b39a2dd9d41d429422561a6b6f4195dd6 (patch) | |
| tree | 1e7f9333de7063b8c64b17fa7dab05d2c61ff958 | |
| parent | 18b4c66dc6c1c13eb836b6d061a482a4971c93b1 (diff) | |
| parent | 55063f854d52f4adec0d62e883bdd9cf8c2277f7 (diff) | |
| download | gitlab-ce-71f7bd6b39a2dd9d41d429422561a6b6f4195dd6.tar.gz | |
Merge branch 'fix-tmp-gitignore' into 'master'
Fix Git ignore rules for tmp/, shared/, and plugins/
See merge request gitlab-org/gitlab-ce!32589
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | plugins/.gitignore | 5 | ||||
| -rw-r--r-- | shared/.gitignore | 4 | ||||
| -rw-r--r-- | tmp/.gitignore | 5 |
4 files changed, 14 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 3ffe4263c4f..fcbb4c352a9 100644 --- a/.gitignore +++ b/.gitignore @@ -61,11 +61,9 @@ eslint-report.html /shared/artifacts/ /rails_best_practices_output.html /tags -/tmp/* /vendor/bundle/* /vendor/gitaly-ruby /builds* -/shared/* /.gitlab_workhorse_secret /webpack-report/ /knapsack/ @@ -73,7 +71,6 @@ eslint-report.html /locale/**/LC_MESSAGES /locale/**/*.time_stamp /.rspec -/plugins/* /.gitlab_pages_secret /.gitlab_smime_key /.gitlab_smime_cert diff --git a/plugins/.gitignore b/plugins/.gitignore new file mode 100644 index 00000000000..e4ccdc9e2ec --- /dev/null +++ b/plugins/.gitignore @@ -0,0 +1,5 @@ +* +!*/ +!.gitignore +!.gitkeep +!examples/* diff --git a/shared/.gitignore b/shared/.gitignore new file mode 100644 index 00000000000..5c0276adafd --- /dev/null +++ b/shared/.gitignore @@ -0,0 +1,4 @@ +* +!*/ +!.gitignore +!.gitkeep diff --git a/tmp/.gitignore b/tmp/.gitignore new file mode 100644 index 00000000000..a383b23fb78 --- /dev/null +++ b/tmp/.gitignore @@ -0,0 +1,5 @@ +* +!*/ +!.gitignore +!.gitkeep +/tests/ |