merged qa into codeocean

2015-03-27 21:27:40 +01:00
parent de154a6f66
commit bad98cca1d
5 changed files with 194 additions and 92 deletions
--- a/config/code_ocean.yml.example
+++ b/config/code_ocean.yml.example
@ -1,11 +1,16 @@
 default: &default
  flowr:
    enabled: false
+  code_pilot:
+    enabled: false

 development:
  flowr:
    enabled: true
    url: http://example.org:3000/api/exceptioninfo?id=&lang=auto
+  code_pilot:
+    enabled: true
+    url: //localhost:3000

 production:
  <<: *default