Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge remote-tracking branch 'origin/master' into gs-master

Browse source 
Conflicts:
 	app/serializers/initial_state_serializer.rb

The glitch flavour isn't yet pulling custom emoji data on its own (see
https://github.com/tootsuite/mastodon/pull/7047).  Once that gets into
the glitch flavour, we can eliminate the custom_emojis load.
This commit is contained in:
David Yip 2018-04-08 19:05:02 -05:00
commit 67e77f230e
No known key found for this signature in database
GPG key ID: 7DA0036508FCC0CC
61 changed files with 373 additions and 1436 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/lib/user_settings_decorator.rb
View file

@ -93,7 +93,7 @@ class UserSettingsDecorator
end
def boolean_cast_setting(key)
settings[key] == '1'
ActiveModel::Type::Boolean.new.cast(settings[key])
end
def coerced_settings(key)
@ -101,7 +101,7 @@ class UserSettingsDecorator
end
def coerce_values(params_hash)
params_hash.transform_values { |x| x == '1' }
params_hash.transform_values { |x| ActiveModel::Type::Boolean.new.cast(x) }
end
def change?(key)