diff db/migrate/099_add_delete_wiki_pages_attachments_permission.rb @ 1526:404aa68d4227

Merge from live branch

--- a/db/migrate/099_add_delete_wiki_pages_attachments_permission.rb	Mon Mar 17 08:57:04 2014 +0000
+++ b/db/migrate/099_add_delete_wiki_pages_attachments_permission.rb	Thu Sep 11 12:46:20 2014 +0100
@@ -1,12 +1,12 @@
 class AddDeleteWikiPagesAttachmentsPermission < ActiveRecord::Migration
   def self.up
-    Role.find(:all).each do |r|
+    Role.all.each do |r|
       r.add_permission!(:delete_wiki_pages_attachments) if r.has_permission?(:edit_wiki_pages)
     end
   end
 
   def self.down
-    Role.find(:all).each do |r|
+    Role.all.each do |r|
       r.remove_permission!(:delete_wiki_pages_attachments)
     end
   end