Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master

Browse source
This commit is contained in:
Eugen Rochko 2017-04-11 20:43:56 +02:00
commit 2a7602cad4
16 changed files with 144 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/user.rb
View file

@ -26,4 +26,8 @@ class User < ApplicationRecord
def setting_default_privacy
settings.default_privacy || (account.locked? ? 'private' : 'public')
end
def setting_boost_modal
settings.boost_modal
end
end