-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3047 from MGatner/composer-lock
Cease ignoring composer.lock in deployable repos
- Loading branch information
Showing
4 changed files
with
256 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,127 @@ | ||
#------------------------- | ||
# Operating Specific Junk Files | ||
#------------------------- | ||
|
||
# OS X | ||
.DS_Store | ||
.AppleDouble | ||
.LSOverride | ||
|
||
# OS X Thumbnails | ||
._* | ||
|
||
# Windows image file caches | ||
Thumbs.db | ||
ehthumbs.db | ||
Desktop.ini | ||
|
||
# Recycle Bin used on file shares | ||
$RECYCLE.BIN/ | ||
|
||
# Windows Installer files | ||
*.cab | ||
*.msi | ||
*.msm | ||
*.msp | ||
|
||
# Windows shortcuts | ||
*.lnk | ||
|
||
# Linux | ||
*~ | ||
|
||
# KDE directory preferences | ||
.directory | ||
|
||
# Linux trash folder which might appear on any partition or disk | ||
.Trash-* | ||
|
||
#------------------------- | ||
# Environment Files | ||
#------------------------- | ||
# These should never be under version control, | ||
# as it poses a security risk. | ||
.env | ||
.vagrant | ||
Vagrantfile | ||
|
||
#------------------------- | ||
# Temporary Files | ||
#------------------------- | ||
writable/cache/* | ||
!writable/cache/index.html | ||
|
||
writable/logs/* | ||
!writable/logs/index.html | ||
|
||
writable/session/* | ||
!writable/session/index.html | ||
|
||
writable/uploads/* | ||
!writable/uploads/index.html | ||
|
||
writable/debugbar/* | ||
|
||
php_errors.log | ||
|
||
#------------------------- | ||
# User Guide Temp Files | ||
#------------------------- | ||
user_guide_src/build/* | ||
user_guide_src/cilexer/build/* | ||
user_guide_src/cilexer/dist/* | ||
user_guide_src/cilexer/pycilexer.egg-info/* | ||
|
||
#------------------------- | ||
# Test Files | ||
#------------------------- | ||
tests/coverage* | ||
|
||
# Don't save phpunit under version control. | ||
phpunit | ||
|
||
#------------------------- | ||
# Composer | ||
#------------------------- | ||
vendor/ | ||
|
||
#------------------------- | ||
# IDE / Development Files | ||
#------------------------- | ||
|
||
# Modules Testing | ||
_modules/* | ||
|
||
# phpenv local config | ||
.php-version | ||
|
||
# Jetbrains editors (PHPStorm, etc) | ||
.idea/ | ||
*.iml | ||
|
||
# Netbeans | ||
nbproject/ | ||
build/ | ||
nbbuild/ | ||
dist/ | ||
nbdist/ | ||
nbactions.xml | ||
nb-configuration.xml | ||
.nb-gradle/ | ||
|
||
# Sublime Text | ||
*.tmlanguage.cache | ||
*.tmPreferences.cache | ||
*.stTheme.cache | ||
*.sublime-workspace | ||
*.sublime-project | ||
.phpintel | ||
/api/ | ||
|
||
# Visual Studio Code | ||
.vscode/ | ||
|
||
/results/ | ||
/phpunit*.xml | ||
/.phpunit.*.cache | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,127 @@ | ||
#------------------------- | ||
# Operating Specific Junk Files | ||
#------------------------- | ||
|
||
# OS X | ||
.DS_Store | ||
.AppleDouble | ||
.LSOverride | ||
|
||
# OS X Thumbnails | ||
._* | ||
|
||
# Windows image file caches | ||
Thumbs.db | ||
ehthumbs.db | ||
Desktop.ini | ||
|
||
# Recycle Bin used on file shares | ||
$RECYCLE.BIN/ | ||
|
||
# Windows Installer files | ||
*.cab | ||
*.msi | ||
*.msm | ||
*.msp | ||
|
||
# Windows shortcuts | ||
*.lnk | ||
|
||
# Linux | ||
*~ | ||
|
||
# KDE directory preferences | ||
.directory | ||
|
||
# Linux trash folder which might appear on any partition or disk | ||
.Trash-* | ||
|
||
#------------------------- | ||
# Environment Files | ||
#------------------------- | ||
# These should never be under version control, | ||
# as it poses a security risk. | ||
.env | ||
.vagrant | ||
Vagrantfile | ||
|
||
#------------------------- | ||
# Temporary Files | ||
#------------------------- | ||
writable/cache/* | ||
!writable/cache/index.html | ||
|
||
writable/logs/* | ||
!writable/logs/index.html | ||
|
||
writable/session/* | ||
!writable/session/index.html | ||
|
||
writable/uploads/* | ||
!writable/uploads/index.html | ||
|
||
writable/debugbar/* | ||
|
||
php_errors.log | ||
|
||
#------------------------- | ||
# User Guide Temp Files | ||
#------------------------- | ||
user_guide_src/build/* | ||
user_guide_src/cilexer/build/* | ||
user_guide_src/cilexer/dist/* | ||
user_guide_src/cilexer/pycilexer.egg-info/* | ||
|
||
#------------------------- | ||
# Test Files | ||
#------------------------- | ||
tests/coverage* | ||
|
||
# Don't save phpunit under version control. | ||
phpunit | ||
|
||
#------------------------- | ||
# Composer | ||
#------------------------- | ||
vendor/ | ||
|
||
#------------------------- | ||
# IDE / Development Files | ||
#------------------------- | ||
|
||
# Modules Testing | ||
_modules/* | ||
|
||
# phpenv local config | ||
.php-version | ||
|
||
# Jetbrains editors (PHPStorm, etc) | ||
.idea/ | ||
*.iml | ||
|
||
# Netbeans | ||
nbproject/ | ||
build/ | ||
nbbuild/ | ||
dist/ | ||
nbdist/ | ||
nbactions.xml | ||
nb-configuration.xml | ||
.nb-gradle/ | ||
|
||
# Sublime Text | ||
*.tmlanguage.cache | ||
*.tmPreferences.cache | ||
*.stTheme.cache | ||
*.sublime-workspace | ||
*.sublime-project | ||
.phpintel | ||
/api/ | ||
|
||
# Visual Studio Code | ||
.vscode/ | ||
|
||
/results/ | ||
/phpunit*.xml | ||
/.phpunit.*.cache | ||
|