Merge remote-tracking branch 'github/master'

Conflicts: app/models/ability.rb
2013-03-02 20:31:22 +01:00
parent cdf7acd426 0de57e08a9
commit f8ad8f4527
4 changed files with 16 additions and 8 deletions
--- a/app/models/neuigkeit.rb
+++ b/app/models/neuigkeit.rb
@@ -1,5 +1,6 @@
 class Neuigkeit < ActiveRecord::Base
  attr_accessible :datum, :text, :title, :rubrik_id
  belongs_to :author, :class_name =>'User'
-  belongs_to :rubrik, :class_name =>'Rubrik'
+  belongs_to :rubrik, :class_name =>'Rubrik', :foreign_key => "rubrik_id"
+
 end