Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields		2018-06-21 20:49:57 +02:00
..
admin	…
concerns	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
form	…
glitch	Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions	2018-06-12 16:39:30 -05:00
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-06-21 20:49:57 +02:00
account_domain_block.rb	…
account_filter.rb	…
account_moderation_note.rb	…
admin.rb	…
application_record.rb	…
backup.rb	…
block.rb	Store URIs of follows, follow requests and blocks for ActivityPub (#7160)	2018-05-04 21:14:34 +02:00
bookmark.rb	Thread scopes through #matches?. #454.	2018-06-03 23:00:50 -05:00
context.rb	…
conversation.rb	…
conversation_mute.rb	…
custom_emoji.rb	…
custom_emoji_filter.rb	…
domain_block.rb	…
email_domain_block.rb	…
export.rb	…
favourite.rb	Improve counter caches on Status and Account (#7644)	2018-05-30 02:50:23 +02:00
feed.rb	…
follow.rb	Store URIs of follows, follow requests and blocks for ActivityPub (#7160)	2018-05-04 21:14:34 +02:00
follow_request.rb	Store URIs of follows, follow requests and blocks for ActivityPub (#7160)	2018-05-04 21:14:34 +02:00
glitch.rb	…
home_feed.rb	…
identity.rb	…
import.rb	…
instance.rb	…
instance_filter.rb	…
invite.rb	Add autofollow option to invites (#7805)	2018-06-15 18:00:23 +02:00
invite_filter.rb	…
list.rb	…
list_account.rb	…
list_feed.rb	…
media_attachment.rb	Remove unnecessary code from MediaAttachment#set_type_and_extension.	2018-05-04 02:38:04 -05:00
mention.rb	…
mute.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
notification.rb	…
preview_card.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	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
status_pin.rb	…
stream_entry.rb	Merge remote-tracking branch 'origin/master' into gs-master	2018-05-03 17:23:44 -05:00
subscription.rb	…
tag.rb	Track trending tags (#7638)	2018-05-27 21:45:30 +02:00
trending_tags.rb	Remove trending hashtags (#7711)	2018-06-04 02:18:18 +02:00
user.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-21 20:49:57 +02:00
web.rb	…