Skip to content

Commit 0c77c26

Browse files
Merge pull request #20233 from MoonE/single-gitignore-file
Merge all git ignores in single file
2 parents 8f0fa82 + 4dbfcac commit 0c77c26

File tree

14 files changed

+56
-35
lines changed

14 files changed

+56
-35
lines changed

.gitignore

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
# Directory for creating releases
22
/release/
3+
34
# Configuration files
45
/config.inc.php
56
/config.header.inc.php
67
/config.footer.inc.php
8+
79
# Upload/save dirs
810
/upload/
911
/save/
1012
/tmp/
13+
1114
# For setup script
1215
/config/
16+
1317
# ctags
1418
tags
19+
1520
# Editor files
1621
phpmyadmin.wpj
1722
.projectOptions
@@ -24,43 +29,93 @@ phpmyadmin.wpj
2429
.netbeans
2530
.vscode
2631
*.sw[op]
32+
2733
# Web server files
2834
web.config
2935
.htaccess
36+
3037
# Locales
3138
/locale/
3239
/resources/locale/
40+
3341
# Temporary files to generate locales for Twig
3442
/twig-templates/
43+
3544
# Backups
3645
*~
46+
3747
# API documentation
3848
/apidoc/
49+
/docs/_build
50+
/docs/doctrees
51+
/docs/html
3952
/docs/linkcheck/
53+
/docs/locale
54+
/docs/*.pyc
55+
/docs/*.swp
56+
4057
# Demo server
4158
revision-info.php
59+
4260
# PHP_CodeSniffer
4361
phpcs.xml
4462
.phpcs-cache
63+
4564
# PHPUnit
65+
.phpunit.result.cache
4666
phpunit.xml
4767
/tests/bootstrap.php
48-
.phpunit.result.cache
68+
/tests/gis/*-actual.json
69+
/tests/gis/*-actual.pdf
70+
/tests/gis/*-actual.png
71+
/tests/gis/*-actual.svg
72+
4973
# Jenkins
5074
/build/
75+
5176
# Netbeans ide stuff
5277
/nbproject/
78+
5379
# Eclipse ide stuff
5480
/.pydevproject
81+
5582
# Ant cache
5683
cache.properties
84+
5785
# Composer
5886
/vendor/
87+
5988
# NPM
6089
/node_modules/
6190
phpstan.neon
91+
6292
# Infection
6393
infection.json5
6494
/js/
6595
/setup/
6696
/themes/
97+
98+
# App
99+
/app/cache/*
100+
!/app/cache/.gitkeep
101+
/app/language_stats_inc.php
102+
103+
# public
104+
/public/js/*
105+
!/public/js/.gitkeep
106+
/public/setup/*.css
107+
/public/setup/*.css.map
108+
/public/themes
109+
!/public/themes/dot.gif
110+
!/public/themes/bootstrap/
111+
!/public/themes/metro/
112+
!/public/themes/original/
113+
!/public/themes/pmahomme/
114+
/public/themes/bootstrap/*.css
115+
/public/themes/bootstrap/*.css.map
116+
/public/themes/metro/*.css
117+
/public/themes/metro/*.css.map
118+
/public/themes/original/*.css
119+
/public/themes/original/*.css.map
120+
/public/themes/pmahomme/*.css
121+
/public/themes/pmahomme/*.css.map

app/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/cache/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

app/cache/.gitkeep

Whitespace-only changes.

docs/.gitignore

Lines changed: 0 additions & 6 deletions
This file was deleted.

public/js/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

public/js/.gitkeep

Whitespace-only changes.

public/setup/.gitignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

public/themes/.gitignore

Lines changed: 0 additions & 7 deletions
This file was deleted.

public/themes/bootstrap/css/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)