diff db/migrate/006_calendar_and_activity.rb @ 1526:404aa68d4227

Merge from live branch

--- a/db/migrate/006_calendar_and_activity.rb	Mon Mar 17 08:57:04 2014 +0000
+++ b/db/migrate/006_calendar_and_activity.rb	Thu Sep 11 12:46:20 2014 +0100
@@ -9,8 +9,8 @@
   end
 
   def self.down
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'projects', 'activity']).destroy
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'projects', 'calendar']).destroy
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'projects', 'gantt']).destroy
+    Permission.where("controller=? and action=?", 'projects', 'activity').first.destroy
+    Permission.where("controller=? and action=?", 'projects', 'calendar').first.destroy
+    Permission.where("controller=? and action=?", 'projects', 'gantt').first.destroy
   end
 end