Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.		2018-12-09 16:08:04 +01:00
..
admin	Update dependencies for Ruby (2018-04-23) (#7237)	2018-04-23 11:29:17 +02:00
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
form
web	Fix has_one association on Web::PushSubscription (#7767)	2018-06-09 21:11:14 +02:00
account.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
account_conversation.rb
account_domain_block.rb
account_filter.rb
account_moderation_note.rb
account_pin.rb
account_stat.rb
account_tag_stat.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
email_domain_block.rb
export.rb
favourite.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
invite_filter.rb
list.rb
list_account.rb
list_feed.rb
media_attachment.rb
mention.rb
mute.rb
notification.rb
preview_card.rb
relay.rb
remote_follow.rb
remote_profile.rb
report.rb
report_filter.rb
report_note.rb
search.rb
session_activation.rb
setting.rb
site_upload.rb
status.rb
status_pin.rb
status_stat.rb
stream_entry.rb
subscription.rb
tag.rb
trending_tags.rb
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-09 16:08:04 +01:00
web.rb