Merge remote-tracking branch 'origin/3.6' into 3

This commit is contained in:
Damian Mooyman 2018-06-08 12:13:18 +12:00
commit a970bdecf3
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
3 changed files with 28 additions and 7 deletions

19
.cow.json Normal file
View File

@ -0,0 +1,19 @@
{
"github-slug": "silverstripe/silverstripe-installer",
"changelog-holder": "silverstripe/framework",
"changelog-path": "docs/en/04_Changelogs/{stability}/{version}.md",
"child-stability-inherit": true,
"dependency-constraint": "exact",
"vendors": [
"silverstripe"
],
"archives": [
{
"recipe": "silverstripe/installer",
"files": [
"SilverStripe-cms-v{version}.zip",
"SilverStripe-cms-v{version}.tar.gz"
]
}
]
}

8
.gitignore vendored
View File

@ -4,8 +4,10 @@
# ignore all environment files
_ss_environment.php
# ignore build tools
/tools/phing-metadata
# ignore composer vendor folder
/vendor/
/framework/
/cms/
/assets/
/siteconfig/
/reports/

8
assets/.gitignore vendored
View File

@ -1,4 +1,4 @@
# Ignore sensible defaults
/*/
/error-*.html
/_combinedfiles/
/**/*
!.gitignore
!.htaccess
!web.config