mirror of
https://github.com/silverstripe/silverstripe-installer
synced 2024-10-22 17:05:33 +02:00
Merge remote-tracking branch 'origin/3.0' into 3.1
This commit is contained in:
commit
b23c744f41
13
.gitattributes
vendored
Normal file
13
.gitattributes
vendored
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
.gitattributes export-ignore
|
||||||
|
behat.yml export-ignore
|
||||||
|
build.properties.default export-ignore
|
||||||
|
build.xml export-ignore
|
||||||
|
changelog-definitions.default export-ignore
|
||||||
|
CONTRIBUTING.md export-ignore
|
||||||
|
dependent-modules.default export-ignore
|
||||||
|
Makefile export-ignore
|
||||||
|
phpunit.teamcity.mssql.xml export-ignore
|
||||||
|
phpunit.teamcity.postgresql.xml export-ignore
|
||||||
|
phpunit.teamcity.sqlite3.xml export-ignore
|
||||||
|
phpunit.teamcity.xml export-ignore
|
||||||
|
phpunit.xml.dist export-ignore
|
14
behat.yml
14
behat.yml
@ -1,13 +1,9 @@
|
|||||||
default:
|
default:
|
||||||
extensions:
|
extensions:
|
||||||
|
|
||||||
SilverStripe\BehatExtension\Extension:
|
SilverStripe\BehatExtension\MinkExtension:
|
||||||
framework_path: framework
|
# Adjust "base_url" to your own website URL.
|
||||||
|
# Can be set via environment variables or _ss_environment.php/$_FILE_TO_URL_MAPPING as well.
|
||||||
Behat\MinkExtension\Extension:
|
|
||||||
# Adjust this to your own website URL.
|
|
||||||
# Uncomment, or set through environment variable:
|
|
||||||
# > export BEHAT_PARAMS="extensions[Behat\MinkExtension\Extension][base_url]=http://localhost/"
|
|
||||||
#
|
#
|
||||||
# base_url: http://localhost/
|
# base_url: http://localhost/
|
||||||
|
|
||||||
@ -17,4 +13,6 @@ default:
|
|||||||
javascript_session: selenium2
|
javascript_session: selenium2
|
||||||
goutte: ~
|
goutte: ~
|
||||||
selenium2:
|
selenium2:
|
||||||
browser: firefox
|
browser: firefox
|
||||||
|
|
||||||
|
SilverStripe\BehatExtension\Extension: ~
|
@ -7,12 +7,6 @@
|
|||||||
"silverstripe/framework": "3.1.x-dev",
|
"silverstripe/framework": "3.1.x-dev",
|
||||||
"silverstripe-themes/simple": "*"
|
"silverstripe-themes/simple": "*"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
|
||||||
"silverstripe/docsviewer": "*",
|
|
||||||
"silverstripe/behat-extension": "*",
|
|
||||||
"silverstripe/buildtools": "*",
|
|
||||||
"phpunit/phpunit": "3.7.*"
|
|
||||||
},
|
|
||||||
"config": {
|
"config": {
|
||||||
"process-timeout": 600
|
"process-timeout": 600
|
||||||
},
|
},
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
<security>
|
<security>
|
||||||
<requestFiltering>
|
<requestFiltering>
|
||||||
<hiddenSegments>
|
<hiddenSegments>
|
||||||
<add segment="silverstripe-cache/" />
|
<add segment="silverstripe-cache" />
|
||||||
<add segment="vendor" />
|
<add segment="vendor" />
|
||||||
<add segment="composer.json" />
|
<add segment="composer.json" />
|
||||||
<add segment="composer.lock" />
|
<add segment="composer.lock" />
|
||||||
@ -15,4 +15,4 @@
|
|||||||
</requestFiltering>
|
</requestFiltering>
|
||||||
</security>
|
</security>
|
||||||
</system.webServer>
|
</system.webServer>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
Loading…
Reference in New Issue
Block a user