asonix/mastodon
1
1
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Fix issues

Browse source
This commit is contained in:
asonix 2020-01-29 09:02:23 -06:00
parent 982bc63d31
commit e5a820e90b
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Gemfile.lock
View file

@ -44,7 +44,7 @@ GEM
actionpack (5.2.4.1)
actionview (= 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)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
@ -789,3 +789,9 @@ DEPENDENCIES
webmock (~> 3.8)
webpacker (~> 4.2)
webpush
RUBY VERSION
ruby 2.6.5p114
BUNDLED WITH
1.17.2

9
app/lib/user_settings_decorator.rb
View file

@ -129,13 +129,12 @@ class UserSettingsDecorator
boolean_cast_setting 'setting_trends'
end
<<<<<<< HEAD
def crop_images_preference
boolean_cast_setting 'setting_crop_images'
=======
def strip_formatting_preference
settings['setting_strip_formatting']
>>>>>>> asonix/changes
end
def crop_images_preference
boolean_cast_setting 'setting_crop_images'
end
def boolean_cast_setting(key)