Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb Upstream added audio attachment support - app/serializers/initial_state_serializer.rb Upstream added audio attachment support and how mimetypes are returned - app/serializers/rest/instance_serializer.rb Upstream added a few fields - config/application.rb Upstream added a different paperclip transcoder		2019-06-24 15:02:59 +02:00
..
admin	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
concerns
form
web
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
account_conversation.rb
account_domain_block.rb	Add option to overwrite imported data (#9962)	2019-02-03 03:59:51 +01:00
account_filter.rb
account_identity_proof.rb
account_moderation_note.rb
account_pin.rb
account_stat.rb
account_tag_stat.rb
account_warning.rb
account_warning_preset.rb
admin.rb
application_record.rb
backup.rb
block.rb
bookmark.rb
context.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	2017-07-07 04:02:06 +02:00
conversation.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
conversation_mute.rb
custom_emoji.rb
custom_emoji_filter.rb
custom_filter.rb	Add option to not consider word boundaries when processing keyword filtering (#7975)	2018-07-09 02:22:09 +02:00
domain_block.rb
email_domain_block.rb
export.rb	Export and import show_reblogs together with following list (#10495)	2019-04-08 07:28:27 +02:00
favourite.rb
featured_tag.rb
feed.rb
follow.rb
follow_request.rb
home_feed.rb
identity.rb
import.rb
instance.rb
instance_filter.rb
invite.rb
invite_filter.rb
list.rb	Add database support for list show-reply preferences	2018-11-28 14:46:07 +01:00
list_account.rb
list_feed.rb
media_attachment.rb
mention.rb
mute.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
notification.rb
poll.rb
poll_vote.rb
preview_card.rb
relay.rb
remote_follow.rb
remote_profile.rb
report.rb
report_filter.rb
report_note.rb
scheduled_status.rb
search.rb
session_activation.rb
setting.rb
site_upload.rb	Improvements to image upload validation and creation (#10431)	2019-04-01 07:30:46 +02:00
status.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-07 17:00:36 +02:00
status_pin.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
status_stat.rb
stream_entry.rb
subscription.rb
tag.rb
tombstone.rb	Record deleted(by mod) status to prevent re-appear (#10732)	2019-05-09 22:03:02 +02:00
trending_tags.rb
user.rb
user_invite_request.rb
web.rb