Ralf Teusner 1551498358 Merge branch 'master' into user_exercise_feedback_backend ...

# Conflicts:
#	app/views/application/_navigation.html.slim

2017-11-01 10:29:43 +01:00

..

deploy

Allow to specify a branch to deploy for staging

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

environments

Add optional logging for tests

2017-10-26 15:42:06 +02:00

initializers

updated rails from 4.1.13 to 4.2.5. This is required for rails to make use of new features in postgres 9.5

2016-12-31 00:05:23 +01:00

locales

Merge branch 'master' into user_exercise_feedback_backend

2017-11-01 10:29:43 +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

switch back from structure.sql to schema.rb

2017-02-22 17:20:26 +01:00

boot.rb

updated rails from 4.1.13 to 4.2.5. This is required for rails to make use of new features in postgres 9.5

2016-12-31 00:05:23 +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

fix edge compatibility in docker config file (wss:// --> wss: ). also clean up hash removal of url and add docker.yml to the files to be deployed by capistrano

2017-03-07 18:09:31 +01:00

docker.yml.erb

fix edge compatibility in docker config file (wss:// --> wss: ). also clean up hash removal of url and add docker.yml to the files to be deployed by capistrano

2017-03-07 18:09:31 +01: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 remote-tracking branch 'origin/master' into error-info

2017-10-15 17:02:19 +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