merge with master

2016-08-03 12:09:58 +02:00
parent d921f90a65 81b3299917
commit 4183a16178
77 changed files with 770 additions and 515 deletions
--- a/app/models/exercise.rb
+++ b/app/models/exercise.rb
@ -11,7 +11,6 @@ class Exercise < ActiveRecord::Base

  belongs_to :execution_environment
  has_many :submissions
-  belongs_to :team

  has_many :external_users, source: :user, source_type: ExternalUser, through: :submissions
  has_many :internal_users, source: :user, source_type: InternalUser, through: :submissions