tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
	Vagrantfile
	app/javascript/packs/public.js
	app/views/admin/settings/edit.html.haml
	app/views/settings/preferences/show.html.haml
	app/views/settings/profiles/show.html.haml
	config/locales/es.yml
	config/locales/simple_form.en.yml
	config/webpack/configuration.js
	config/webpack/loaders/babel.js
	package.json
	yarn.lock

Split new additions to app/javascript/packs/public.js to
app/javascript/core/settings.js
This commit is contained in:
Thibaut Girka
2018-09-19 21:46:01 +02:00
parent 382cdd7f95 554f659f2a
commit 91bef4759f
274 changed files with 5666 additions and 4173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/serializers/rest/account_serializer.rb
View File

@ -13,6 +13,10 @@ class REST::AccountSerializer < ActiveModel::Serializer
class FieldSerializer < ActiveModel::Serializer
attributes :name, :value
attribute :verified_at, if: :verifiable?
delegate :verifiable?, to: :object
def value
Formatter.instance.format_field(object.account, object.value)
end