Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/media_attachment.rb		2019-05-04 16:37:26 +02:00
..
admin
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-04 16:37:26 +02:00
form
web
account.rb
account_conversation.rb
account_domain_block.rb
account_filter.rb
account_identity_proof.rb	Fix Keybase verification using wrong domain for remote accounts (#10547)	2019-04-10 20:28:43 +02:00
account_moderation_note.rb
account_pin.rb
account_stat.rb
account_tag_stat.rb
account_warning.rb
account_warning_preset.rb
admin.rb	Add logging of admin actions (#5757)	2017-11-24 02:05:53 +01:00
application_record.rb
backup.rb	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
block.rb	Store URIs of follows, follow requests and blocks for ActivityPub (#7160)	2018-05-04 21:14:34 +02:00
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
custom_emoji.rb
custom_emoji_filter.rb
custom_filter.rb
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	Fix error when trying to update counters for statuses that are gone (#8251)	2018-08-18 03:03:23 +02:00
featured_tag.rb	Fix featured tag form not failing on failed tag validations (#10167)	2019-03-05 03:46:24 +01:00
feed.rb
follow.rb
follow_request.rb
home_feed.rb
identity.rb	Change identities id column to a bigint (#9371)	2018-11-27 13:56:25 +01:00
import.rb	Add option to overwrite imported data (#9962)	2019-02-03 03:59:51 +01:00
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	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
notification.rb
poll.rb
poll_vote.rb	Add optimistic lock to avoid race conditions when handling votes (#10196)	2019-03-06 19:53:57 +01:00
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
session_activation.rb
setting.rb	Remove intermediary arrays when creating hash maps from results (#9291)	2018-11-16 15:02:18 +01:00
site_upload.rb
status.rb
status_pin.rb
status_stat.rb
stream_entry.rb
subscription.rb
tag.rb
tombstone.rb
trending_tags.rb
user.rb
user_invite_request.rb
web.rb