Ralf Teusner 1511941d3d Merge branch 'master' into editor-frontend-refactor ...

Conflicts:
	codeocean-dockerconfig.md

2016-11-09 18:00:40 +01:00

..

deploy

Allow to specify a branch to deploy for staging

2016-09-02 15:05:48 +02:00

environments

some more relative url roots in editor_edit, removed javascript uglifying for staging, added debug message for docker websocket connection url.

2016-10-07 14:16:24 +02:00

initializers

minor refactoring of flash messages

2015-03-23 16:42:57 +01:00

locales

Merge branch 'master' into editor-frontend-refactor

2016-11-09 18:00:40 +01:00

action_mailer.yml.example

transferred Code Ocean from original repository to GitHub

2015-01-22 10:01:32 +01:00

action_mailer.yml.travis

added further configuration files for Travis CI

2015-01-29 08:45:45 +01:00

application.rb

Merge branch 'master' into editor-frontend-refactor

2016-09-02 15:04:18 +02:00

boot.rb

transitionally downgraded to Rails 4.1 since activerecord-jdbcpostgresql-adapter is not fully compatible with Active Record 4.2

2015-03-02 15:04:37 +01:00

code_ocean.yml.example

Disable breaking standard enable of CodePilot

2015-03-28 18:52:31 +01:00

code_ocean.yml.travis

merged qa into codeocean

2015-03-27 21:27:40 +01:00

database.yml.example

transferred Code Ocean from original repository to GitHub

2015-01-22 10:01:32 +01:00

database.yml.travis

increased database pool size on Travis CI

2015-02-23 14:42:22 +01:00

deploy.rb

Removed bin folder from linked_dirs in deploy, otherwise no rails console can be started on the servers, because the directory will be empty (as stated on several stackoverflow questions, for example: http://stackoverflow.com/questions/29039927/rails-4-doesnt-detect-application-after-capistrano-deployment )

2016-11-09 17:56:56 +01:00

docker.yml.erb

Merge branch 'master' into editor-frontend-refactor

2016-09-02 15:04:18 +02:00

docker.yml.erb.example

Added docker.yml.erb to gitignore.

2016-08-12 14:45:08 +02:00

environment.rb

transferred Code Ocean from original repository to GitHub

2015-01-22 10:01:32 +01:00

newrelic.yml.example

added New Relic

2015-04-11 16:54:48 +02:00

routes.rb

Merge branch 'master' into feature-file-templates

2016-07-28 15:16:11 +02:00

secrets.yml.example

transferred Code Ocean from original repository to GitHub

2015-01-22 10:01:32 +01:00

secrets.yml.travis

added further configuration files for Travis CI

2015-01-29 08:45:45 +01:00

sendmail.yml.example

transferred Code Ocean from original repository to GitHub

2015-01-22 10:01:32 +01:00

smtp.yml.example

transferred Code Ocean from original repository to GitHub

2015-01-22 10:01:32 +01:00