tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.0' into 3.1

Browse Source 
Conflicts:
	.travis.yml
This commit is contained in:
Simon Welsh 2013-07-14 17:24:06 +12:00
commit ff18abb994
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -16,9 +16,6 @@ matrix:
env: DB=MYSQL CORE_RELEASE=3.1 env: DB=MYSQL CORE_RELEASE=3.1
- php: 5.5 - php: 5.5
env: DB=MYSQL CORE_RELEASE=3.1 env: DB=MYSQL CORE_RELEASE=3.1
allow_failures:
- php: 5.5
env: DB=MYSQL CORE_RELEASE=3.1
before_script: before_script:
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
@ -40,4 +37,4 @@ branches:
notifications: notifications:
irc: irc:
channels: channels:
- "irc.freenode.org#silverstripe" - "irc.freenode.org#silverstripe"

3
code/controllers/ContentController.php
View File

@ -24,7 +24,8 @@ class ContentController extends Controller {
private static $allowed_actions = array( private static $allowed_actions = array(
'successfullyinstalled', 'successfullyinstalled',
'deleteinstallfiles' // secured through custom code 'deleteinstallfiles', // secured through custom code
'LoginForm'
); );
/** /**