merge master

2016-07-14 13:22:24 +02:00
parent 59536ab189
commit f5868a4fa2
29 changed files with 78 additions and 351 deletions
--- a/app/models/internal_user.rb
+++ b/app/models/internal_user.rb
@@ -3,8 +3,6 @@ class InternalUser < ActiveRecord::Base

  authenticates_with_sorcery!

-  has_and_belongs_to_many :teams
-
  validates :email, presence: true, uniqueness: true
  validates :password, confirmation: true, if: :password_void?, on: :update, presence: true
  validates :role, inclusion: {in: ROLES}