Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu.		2019-04-10 09:16:08 +02:00
..
admin	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
concerns
form	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-10 09:16:08 +02:00
web	Do no retry web push workers if the server returns a 4xx response (#9434)	2018-12-17 03:14:13 +01:00
account.rb
account_conversation.rb
account_domain_block.rb
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
conversation.rb
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	Add domain search/filter to the "Federation" (/admin/instances) page (#10071)	2019-02-18 14:59:19 +01:00
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	Extract counters from accounts table to account_stats table (#9295)	2018-11-19 00:43:52 +01:00
follow_request.rb
home_feed.rb
identity.rb
import.rb
instance.rb
instance_filter.rb
invite.rb	Keyword/phrase filtering (#7905)	2018-06-29 15:34:36 +02:00
invite_filter.rb
list.rb
list_account.rb
list_feed.rb
media_attachment.rb
mention.rb	Improve support for aspects/circles (#8950)	2018-10-17 17:13:04 +02:00
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	Fix relay enabling/disabling not resetting inbox availability status (#10048)	2019-02-15 16:08:59 +01:00
remote_follow.rb	Add remote interaction dialog for toots (#8202)	2018-08-18 03:03:12 +02:00
remote_profile.rb
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	Merge branch 'master' into glitch-soc/merge-upstream	2019-03-28 13:01:33 +01:00
status_pin.rb
status_stat.rb	Reset status cache when status_stat or media_attachment updates (#9119)	2018-10-28 06:42:34 +01:00
stream_entry.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
subscription.rb
tag.rb
tombstone.rb
trending_tags.rb
user.rb
user_invite_request.rb
web.rb