Merge branch 'master' of https://github.com/fetsite/fetsite

Conflicts: Gemfile.lock
2014-10-19 16:04:38 +02:00
parent a40e5307bf 2fbd277e21
commit 74c1877500
1 changed files with 2 additions and 1 deletions
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -23,6 +23,7 @@ class Ability
      can :manage, Lva
      can :manage, Studium
      can :manage, Beispiel
+      can :manage, Lecturer
    end
    unless user.has_role?("fetadmin")
      cannot :delete, Studium