Commit 68e50a17829b34faeab837916c1a532a16ca597b
1 parent
749a9a8c
Exists in
theme-brasil-digital-from-staging
and in
9 other branches
fixing conflit with next
Showing
2 changed files
with
0 additions
and
11 deletions
Show diff stats
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