Download as
Browse Code »

Commit 68e50a17829b34faeab837916c1a532a16ca597b

Authored by Leandro Santos
1 parent 749a9a8c
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

fixing conflit with next

Showing 2 changed files with 0 additions and 11 deletions   Show diff stats
app/models/comment.rb
  Diff comments   View file @68e50a1
... ... @@ -44,8 +44,6 @@ class Comment < ActiveRecord::Base
44 44 end
45 45 end
46 46  
47   - acts_as_having_settings :field => :setting
48   -
49 47 acts_as_having_settings
50 48  
51 49 xss_terminate :only => [ :body, :title, :name ], :on => 'validation'
... ...
db/migrate/20140505190748_add_setting_to_comments.rb
View file @749a9a8
... ... @@ -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