mastodon/app/models
Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
  Took our version.
- CONTRIBUTING.md
  Updated the embedded copy of upstream's version.
- README.md
  Took our version.
- app/policies/status_policy.rb
  Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
  Added upstream's changes (dns-prefetch) and fixed
  `%body.embed`
- app/views/settings/preferences/show.html.haml
  Reverted some of upstream changes, as we have a
  page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
  Kept our version of the CSP.
- config/initializers/doorkeeper.rb
  Not a real conflict, took code from both.
2018-10-22 17:51:38 +02:00
..
admin
concerns Merge branch 'master' into glitch-soc/merge-upstream 2018-10-08 13:51:33 +02:00
form Allow selecting both default flavour and theme 2018-10-12 19:06:35 +02: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-10-05 15:23:57 +02:00
account_conversation.rb Add unread indicator to conversations (#9009) 2018-10-19 01:47:29 +02:00
account_domain_block.rb
account_filter.rb Change admin accounts default sort to most recent (#8813) 2018-10-04 16:05:38 +02:00
account_moderation_note.rb
account_pin.rb
admin.rb
application_record.rb
backup.rb Update dependencies for Ruby (2018-04-23) (#7237) 2018-04-23 11:29:17 +02:00
block.rb
bookmark.rb
context.rb
conversation.rb Update dependencies for Ruby (2018-04-23) (#7237) 2018-04-23 11:29:17 +02:00
conversation_mute.rb
custom_emoji.rb
custom_emoji_filter.rb
custom_filter.rb
domain_block.rb Add option to block reports from domain (#8830) 2018-10-20 08:02:44 +02:00
email_domain_block.rb
export.rb
favourite.rb
feed.rb Support min_id-based pagination in REST API (#8736) 2018-09-28 02:23:45 +02:00
follow.rb Limit the number of people that can be followed from one account (#8807) 2018-10-04 17:36:11 +02:00
follow_request.rb Limit the number of people that can be followed from one account (#8807) 2018-10-04 17:36:11 +02:00
home_feed.rb Support min_id-based pagination in REST API (#8736) 2018-09-28 02:23:45 +02:00
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 Merge branch 'master' into glitch-soc/merge-upstream 2018-08-01 00:18:13 +02:00
mention.rb Improve support for aspects/circles (#8950) 2018-10-17 17:13:04 +02:00
mute.rb
notification.rb Improve support for aspects/circles (#8950) 2018-10-17 17:13:04 +02:00
preview_card.rb
relay.rb
remote_follow.rb
remote_profile.rb [WIP] Enable custom emoji on account pages and in the sidebar (#6124) 2018-04-01 23:55:42 +02:00
report.rb Add preference for report notification e-mails, skip for duplicates (#8559) 2018-09-02 00:11:58 +02:00
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-10-22 17:51:38 +02:00
status_pin.rb
status_stat.rb
stream_entry.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
subscription.rb
tag.rb
trending_tags.rb
user.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
web.rb