diff .svn/pristine/6e/6ee18bb17d137e4f0b4784f2e268e5d69c2ef948.svn-base @ 935:fe0249c097f6 live

Merge from the default branch

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/6e/6ee18bb17d137e4f0b4784f2e268e5d69c2ef948.svn-base	Wed Jul 11 13:33:14 2012 +0100
@@ -0,0 +1,12 @@
+class IssueAddNote < ActiveRecord::Migration
+  # model removed
+  class Permission < ActiveRecord::Base; end
+
+  def self.up
+    Permission.create :controller => "issues", :action => "add_note", :description => "label_add_note", :sort => 1057, :mail_option => 1, :mail_enabled => 0
+  end
+
+  def self.down
+    Permission.find(:first, :conditions => ["controller=? and action=?", 'issues', 'add_note']).destroy
+  end
+end