Thibaut Girka 89bee860cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/services/post_status_service.rb Small conflict due to handling of instance-local toots. A subsequent change is required to ensure instance-local polls are not leaked through Update.		2019-03-11 11:23:50 +01:00
..
admin	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-05 19:23:16 +01:00
form	Merge branch 'master' into glitch-soc/merge-upstream	2019-01-02 15:36:53 +01:00
web
account.rb
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_moderation_note.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
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
conversation.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
conversation_mute.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
custom_emoji.rb
custom_emoji_filter.rb
custom_filter.rb
domain_block.rb
email_domain_block.rb	Create DomainNormalizable#normalize_domain (#9631)	2018-12-26 06:38:42 +01:00
export.rb
favourite.rb
featured_tag.rb
feed.rb
follow.rb
follow_request.rb
home_feed.rb	Support min_id-based pagination in REST API (#8736)	2018-09-28 02:23:45 +02:00
identity.rb
import.rb
instance.rb
instance_filter.rb
invite.rb
invite_filter.rb
list.rb
list_account.rb
list_feed.rb
media_attachment.rb
mention.rb
mute.rb
notification.rb	Support pushing and receiving updates to poll tallies (#10209)	2019-03-11 00:49:31 +01:00
poll.rb
poll_vote.rb
preview_card.rb
relay.rb
remote_follow.rb
remote_profile.rb	[WIP] Enable custom emoji on account pages and in the sidebar (#6124)	2018-04-01 23:55:42 +02:00
report.rb
report_filter.rb
report_note.rb
scheduled_status.rb
search.rb	Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)	2017-07-07 04:02:06 +02:00
session_activation.rb
setting.rb
site_upload.rb
status.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-05 19:23:16 +01: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
trending_tags.rb
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-26 17:04:44 +01:00
web.rb