mastodon/app/models
David Yip 2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/javascript/styles/mastodon/components.scss
	app/javascript/styles/mastodon/modal.scss
2018-01-19 15:22:10 -06:00
..
admin Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
concerns Allow hiding of reblogs from followed users (#5762) 2017-11-28 15:00:35 +01:00
form Add more instance stats APIs (#6125) 2017-12-29 19:52:04 +01:00
glitch
web
account.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-19 15:22:10 -06:00
account_domain_block.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
account_filter.rb Clean up admin UI for accounts (#6004) 2017-12-13 12:15:10 +01:00
account_moderation_note.rb Lists (#5703) 2017-11-18 00:16:48 +01:00
admin.rb
application_record.rb
block.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
context.rb
conversation.rb
conversation_mute.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
custom_emoji.rb
custom_emoji_filter.rb Add filters to admin UI for custom emojis (#6003) 2017-12-13 13:28:31 +01:00
domain_block.rb
email_domain_block.rb
export.rb Settings export refactor (#1646) 2017-04-13 13:02:02 +02:00
favourite.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
feed.rb
follow.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
follow_request.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
glitch.rb
home_feed.rb
import.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
instance.rb
instance_filter.rb
invite.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
invite_filter.rb Add invite filter (#5862) 2017-12-01 16:40:02 +01:00
list.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
list_account.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
list_feed.rb
media_attachment.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-19 15:22:10 -06:00
mention.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
mute.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-19 15:22:10 -06:00
notification.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
preview_card.rb Ensure link thumbnails are not stretched to super low quality (#5932) 2017-12-09 00:56:16 +01:00
remote_follow.rb Using double splat operator (#5859) 2017-12-06 11:41:57 +01:00
remote_profile.rb
report.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
report_filter.rb
search.rb
session_activation.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
setting.rb
site_upload.rb
status.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-19 15:22:10 -06:00
status_pin.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
stream_entry.rb
subscription.rb Change belongs_to_required_by_default to true (#5888) 2018-01-19 20:56:47 +01:00
tag.rb Fix account and tag searches with leading/trailing spaces (#5965) 2017-12-10 19:35:46 +01:00
user.rb Merge remote-tracking branch 'origin/master' into merge-upstream 2018-01-19 15:22:10 -06:00
web.rb