diff db/migrate/007_create_journals.rb @ 1526:404aa68d4227

Merge from live branch

--- a/db/migrate/007_create_journals.rb	Mon Mar 17 08:57:04 2014 +0000
+++ b/db/migrate/007_create_journals.rb	Thu Sep 11 12:46:20 2014 +0100
@@ -28,7 +28,7 @@
     Permission.create :controller => "issues", :action => "history", :description => "label_history", :sort => 1006, :is_public => true, :mail_option => 0, :mail_enabled => 0
 
     # data migration
-    IssueHistory.find(:all, :include => :issue).each {|h|
+    IssueHistory.all.each {|h|
       j = Journal.new(:journalized => h.issue, :user_id => h.author_id, :notes => h.notes, :created_on => h.created_on)
       j.details << JournalDetail.new(:property => 'attr', :prop_key => 'status_id', :value => h.status_id)
       j.save
@@ -51,6 +51,6 @@
 
     add_index "issue_histories", ["issue_id"], :name => "issue_histories_issue_id"
 
-    Permission.find(:first, :conditions => ["controller=? and action=?", 'issues', 'history']).destroy
+    Permission.where("controller=? and action=?", 'issues', 'history').first.destroy
   end
 end