mastodon/app/models
Thibaut Girka 0158937fc2 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- Dockerfile
  Took upstream version and reverted f13ebd02c9.
  Hopefuly it's not needed anymore.
- app/controllers/api/v1/search_controller.rb
  The conflict was due to us raising the number of results returned.
  Upstream raised it further, so took it.
- config/locales/de.yml
  Took upstream changes to theme translation strings.
- config/locales/gl.yml
  Took upstream changes to theme translation strings.
- config/locales/nl.yml
  Took upstream changes to theme translation strings.
- config/locales/sk.yml
  Took upstream changes to theme translation strings.
2019-02-26 17:04:44 +01:00
..
admin Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
concerns Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01:00
form Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01: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 Merge branch 'master' into glitch-soc/merge-upstream 2019-02-26 17:04:44 +01:00
account_conversation.rb Fix crash when conversations have no valid participants (#10078) 2019-02-19 20:00:41 +01:00
account_domain_block.rb Add option to overwrite imported data (#9962) 2019-02-03 03:59:51 +01:00
account_filter.rb Redesign admin accounts index (#9340) 2018-11-26 15:53:27 +01:00
account_moderation_note.rb
account_pin.rb Add API endpoint to list featured accounts (fixes #8315) (#8317) 2018-08-20 18:46:04 +02:00
account_stat.rb Add profile directory (#9427) 2018-12-06 17:36:11 +01:00
account_tag_stat.rb Add profile directory (#9427) 2018-12-06 17:36:11 +01:00
account_warning.rb Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
account_warning_preset.rb Add moderation warnings (#9519) 2018-12-22 20:02:09 +01:00
admin.rb
application_record.rb
backup.rb
block.rb
bookmark.rb
context.rb Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090) 2017-07-07 04:02:06 +02:00
conversation.rb
conversation_mute.rb
custom_emoji.rb Make custom emoji domains case insensitive #9351 (#9474) 2018-12-11 05:30:57 +01:00
custom_emoji_filter.rb Make custom emoji domains case insensitive #9351 (#9474) 2018-12-11 05:30:57 +01:00
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 Add option to overwrite imported data (#9962) 2019-02-03 03:59:51 +01:00
favourite.rb
featured_tag.rb Add featured hashtags to profiles (#9755) 2019-02-04 04:25:59 +01:00
feed.rb Create Redisable#redis (#9633) 2019-02-02 19:11:38 +01:00
follow.rb
follow_request.rb
home_feed.rb
identity.rb Change identities id column to a bigint (#9371) 2018-11-27 13:56:25 +01:00
import.rb Add option to overwrite imported data (#9962) 2019-02-03 03:59:51 +01:00
instance.rb Redesign admin instances area (#9645) 2019-01-08 13:39:49 +01:00
instance_filter.rb Add domain search/filter to the "Federation" (/admin/instances) page (#10071) 2019-02-18 14:59:19 +01:00
invite.rb
invite_filter.rb
list.rb Add database support for list show-reply preferences 2018-11-28 14:46:07 +01:00
list_account.rb
list_feed.rb
media_attachment.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-02-10 21:10:09 +01: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 Add WebP support (#9879) 2019-02-02 12:25:04 +01:00
relay.rb Fix relay enabling/disabling not resetting inbox availability status (#10048) 2019-02-15 16:08:59 +01:00
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
report_filter.rb
report_note.rb Fix scope latest of ReportNote (#9630) 2018-12-26 06:38:59 +01:00
scheduled_status.rb Fix deleting a scheduled status immediately deleting media attachments (#9728) 2019-01-06 16:38:40 +01:00
search.rb
session_activation.rb
setting.rb
site_upload.rb
status.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-01-19 18:28:37 +01:00
status_pin.rb
status_stat.rb
stream_entry.rb
subscription.rb
tag.rb Add type, limit, offset, min_id, max_id, account_id to search API (#10091) 2019-02-26 15:21:36 +01:00
tombstone.rb Fix missing account association in tombstone model (#9857) 2019-01-18 23:52:09 +01:00
trending_tags.rb Create Redisable#redis (#9633) 2019-02-02 19:11:38 +01:00
user.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-02-26 17:04:44 +01:00
web.rb