mirror of
https://github.com/silverstripe/silverstripe-installer
synced 2024-10-22 17:05:33 +02:00
Merge remote-tracking branch 'origin/3.5' into 3.6
This commit is contained in:
commit
45b3cb6a43
19
.cow.json
Normal file
19
.cow.json
Normal 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
8
.gitignore
vendored
@ -4,8 +4,10 @@
|
|||||||
# ignore all environment files
|
# ignore all environment files
|
||||||
_ss_environment.php
|
_ss_environment.php
|
||||||
|
|
||||||
# ignore build tools
|
|
||||||
/tools/phing-metadata
|
|
||||||
|
|
||||||
# ignore composer vendor folder
|
# ignore composer vendor folder
|
||||||
/vendor/
|
/vendor/
|
||||||
|
/framework/
|
||||||
|
/cms/
|
||||||
|
/assets/
|
||||||
|
/siteconfig/
|
||||||
|
/reports/
|
||||||
|
8
assets/.gitignore
vendored
8
assets/.gitignore
vendored
@ -1,4 +1,4 @@
|
|||||||
# Ignore sensible defaults
|
/**/*
|
||||||
/*/
|
!.gitignore
|
||||||
/error-*.html
|
!.htaccess
|
||||||
/_combinedfiles/
|
!web.config
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
"silverstripe-themes/simple": "3.1.*"
|
"silverstripe-themes/simple": "3.1.*"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/PHPUnit": "~3.7@stable"
|
"phpunit/phpunit": "^3 || ^4 || ^5"
|
||||||
},
|
},
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
|
Loading…
Reference in New Issue
Block a user