Commit 68e50a17829b34faeab837916c1a532a16ca597b

Authored by Leandro Santos
1 parent 749a9a8c

fixing conflit with next

app/models/comment.rb
@@ -44,8 +44,6 @@ class Comment < ActiveRecord::Base @@ -44,8 +44,6 @@ class Comment < ActiveRecord::Base
44 end 44 end
45 end 45 end
46 46
47 - acts_as_having_settings :field => :setting  
48 -  
49 acts_as_having_settings 47 acts_as_having_settings
50 48
51 xss_terminate :only => [ :body, :title, :name ], :on => 'validation' 49 xss_terminate :only => [ :body, :title, :name ], :on => 'validation'
db/migrate/20140505190748_add_setting_to_comments.rb
@@ -1,9 +0,0 @@ @@ -1,9 +0,0 @@
1 -class AddSettingToComments < ActiveRecord::Migration  
2 - def self.up  
3 - add_column :comments, :setting, :text  
4 - end  
5 -  
6 - def self.down  
7 - remove_column :comments, :setting  
8 - end  
9 -end