Fix issues
This commit is contained in:
parent
982bc63d31
commit
e5a820e90b
|
@ -44,7 +44,7 @@ GEM
|
||||||
actionpack (5.2.4.1)
|
actionpack (5.2.4.1)
|
||||||
actionview (= 5.2.4.1)
|
actionview (= 5.2.4.1)
|
||||||
activesupport (= 5.2.4.1)
|
activesupport (= 5.2.4.1)
|
||||||
rack (~> 2.0, >= 2.1.2)
|
rack (~> 2.0, >= 2.0.8)
|
||||||
rack-test (>= 0.6.3)
|
rack-test (>= 0.6.3)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
|
@ -789,3 +789,9 @@ DEPENDENCIES
|
||||||
webmock (~> 3.8)
|
webmock (~> 3.8)
|
||||||
webpacker (~> 4.2)
|
webpacker (~> 4.2)
|
||||||
webpush
|
webpush
|
||||||
|
|
||||||
|
RUBY VERSION
|
||||||
|
ruby 2.6.5p114
|
||||||
|
|
||||||
|
BUNDLED WITH
|
||||||
|
1.17.2
|
||||||
|
|
|
@ -129,13 +129,12 @@ class UserSettingsDecorator
|
||||||
boolean_cast_setting 'setting_trends'
|
boolean_cast_setting 'setting_trends'
|
||||||
end
|
end
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
def crop_images_preference
|
|
||||||
boolean_cast_setting 'setting_crop_images'
|
|
||||||
=======
|
|
||||||
def strip_formatting_preference
|
def strip_formatting_preference
|
||||||
settings['setting_strip_formatting']
|
settings['setting_strip_formatting']
|
||||||
>>>>>>> asonix/changes
|
end
|
||||||
|
|
||||||
|
def crop_images_preference
|
||||||
|
boolean_cast_setting 'setting_crop_images'
|
||||||
end
|
end
|
||||||
|
|
||||||
def boolean_cast_setting(key)
|
def boolean_cast_setting(key)
|
||||||
|
|
Loading…
Reference in a new issue