Thibaut Girka 02062aab55 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/about_controller.rb - app/controllers/tags_controller.rb - app/views/about/show.html.haml - spec/views/about/show.html.haml_spec.rb		2019-03-13 15:16:02 +01:00
..
admin	…
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-13 15:16:02 +01:00
form	…
web	…
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-13 15:16:02 +01:00
account_conversation.rb	Fix crash when conversations have no valid participants (#10078)	2019-02-19 20:00:41 +01:00
account_domain_block.rb	…
account_filter.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	…
conversation.rb	…
conversation_mute.rb	…
custom_emoji.rb	…
custom_emoji_filter.rb	…
custom_filter.rb	…
domain_block.rb	Add domain search/filter to the "Federation" (/admin/instances) page (#10071)	2019-02-18 14:59:19 +01:00
email_domain_block.rb	…
export.rb	Fix lists export (#10136)	2019-03-03 15:38:47 +01:00
favourite.rb	…
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	…
import.rb	…
instance.rb	…
instance_filter.rb	Add domain search/filter to the "Federation" (/admin/instances) page (#10071)	2019-02-18 14:59:19 +01:00
invite.rb	…
invite_filter.rb	…
list.rb	…
list_account.rb	…
list_feed.rb	…
media_attachment.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-02-10 21:10:09 +01:00
mention.rb	Improve support for aspects/circles (#8950)	2018-10-17 17:13:04 +02:00
mute.rb	…
notification.rb	Support pushing and receiving updates to poll tallies (#10209)	2019-03-11 00:49:31 +01:00
poll.rb	Do not allow adding votes to expired polls (#10214)	2019-03-08 00:54:50 +01:00
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	Fix relay enabling/disabling not resetting inbox availability status (#10048)	2019-02-15 16:08:59 +01:00
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	…
status.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-05 19:23:16 +01:00
status_pin.rb	…
status_stat.rb	…
stream_entry.rb	…
subscription.rb	…
tag.rb	Fix `tagged` param not being normalized before querying tags (#10249)	2019-03-13 13:02:13 +01:00
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	…