Merge remote-tracking branch 'origin/master' into flowr

# Conflicts: # app/assets/javascripts/editor/evaluation.js # app/assets/javascripts/editor/participantsupport.js # app/views/exercises/_editor_output.html.slim # config/code_ocean.yml.example # config/routes.rb
2018-11-28 13:14:21 +01:00
parent ebea8da341 5d13ee0e56
commit b9dce854c4
500 changed files with 12187 additions and 3430 deletions
--- a/app/policies/code_ocean/error_policy.rb
+++ b/app/policies/code_ocean/error_policy.rb
@@ -0,0 +1,7 @@
+module CodeOcean
+  class ErrorPolicy < AdminOrAuthorPolicy
+    def author?
+      @user == @record.execution_environment.author
+    end
+  end
+end
--- a/app/policies/error_policy.rb
+++ b/app/policies/error_policy.rb
@@ -1,5 +0,0 @@
-class ErrorPolicy < AdminOrAuthorPolicy
-  def author?
-    @user == @record.execution_environment.author
-  end
-end