Ralf Teusner f2db88f952 Merge branch 'master' into travis-green-docker ...

took all the newer versions. Only thing I deleted is the part #to pass the test "it executes the run command" ...
We need to shortly discuss this yqbk.

Conflicts:
	lib/docker_client.rb

2016-11-09 18:25:02 +01:00

..

admin

administrator dashboard for observing the Docker container pool

2015-02-10 12:23:26 +01:00

code_ocean

solve extension probelm

2016-08-03 17:21:49 +02:00

concerns

Use file template to generate new file content

2016-06-10 13:41:38 +02:00

application_controller.rb

Revert stuff

2015-04-28 16:48:52 +02:00

code_harbor_links_controller.rb

Associate code harbor links with current user always

2016-02-12 11:05:30 +01:00

comments_controller.rb

First working version of mails on comments.

2016-06-17 14:48:57 +02:00

consumers_controller.rb

added pagination for all resources

2015-03-11 16:13:45 +01:00

errors_controller.rb

submission controller spec - problem with Rails.logger.error

2016-06-14 16:07:44 +02:00

execution_environments_controller.rb

added standard deviations

2016-01-11 19:00:53 +01:00

exercises_controller.rb

Merge branch 'master' into editor-frontend-refactor

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

external_users_controller.rb

Speed up external user statistics

2016-01-28 14:46:25 +01:00

file_templates_controller.rb

Only show file templates which are available for the selected file type

2016-06-10 17:48:04 +02:00

file_types_controller.rb

added pagination for all resources

2015-03-11 16:13:45 +01:00

hints_controller.rb

added pagination for all resources

2015-03-11 16:13:45 +01:00

internal_users_controller.rb

minor refactoring of flash messages

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

request_for_comments_controller.rb

redirect to RFCs on max score: redirect users to their own RFCs if they are open, fixed wrong usage of user_id (external_id is not used in RFCs, normal id has to be used!).

2016-11-09 17:58:10 +01:00

sessions_controller.rb

minor refactoring of flash messages

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

submissions_controller.rb

Merge branch 'master' into travis-green-docker

2016-11-09 18:25:02 +01:00