Mastodon

History

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

Conflicts:
 	app/models/status.rb

The conflict in the Status model was due to
5bf5003384.
It was resolved by accepting tootsuite's changes.

2018-06-07 05:13:49 -05:00

admin

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

concerns

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-06-07 05:13:49 -05:00

form

Add option to show only local toots in timeline preview (#6292 )

2018-02-04 06:00:10 +01:00

glitch

Escape metacharacters in non-whole-word keyword mutes. Fixes #533 .

2018-06-05 02:49:28 -05:00

web

Ensure push subscription is immediately removed when application is revoked (#7548 )

2018-05-19 21:05:08 +02:00

account_domain_block.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

account_filter.rb

Clean up admin UI for accounts (#6004 )

2017-12-13 12:15:10 +01:00

account_moderation_note.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

account.rb

Merge remote-tracking branch 'origin/master' into merge-upstream

2018-05-18 08:47:10 -05:00

admin.rb

…

application_record.rb

Validate HTTP response length while receiving (#6891 )

2018-03-26 14:02:10 +02:00

backup.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

block.rb

Store URIs of follows, follow requests and blocks for ActivityPub (#7160 )

2018-05-04 21:14:34 +02:00

bookmark.rb

Add backend support for bookmarks

2018-04-11 20:40:29 +02:00

context.rb

…

conversation_mute.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

conversation.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

custom_emoji_filter.rb

Change custom emoji search to ILIKE instead of = (#7099 )

2018-04-10 15:46:27 +02:00

custom_emoji.rb

Add entity cache (#7271 )

2018-04-27 01:38:10 +02:00

domain_block.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

email_domain_block.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

export.rb

…

favourite.rb

Improve counter caches on Status and Account (#7644 )

2018-05-30 02:50:23 +02:00

feed.rb

…

follow_request.rb

Store URIs of follows, follow requests and blocks for ActivityPub (#7160 )

2018-05-04 21:14:34 +02:00

follow.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

CAS + SAML authentication feature (#6425 )

2018-02-04 05:42:13 +01:00

import.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

instance_filter.rb

…

instance.rb

…

invite_filter.rb

Add invite filter (#5862 )

2017-12-01 16:40:02 +01:00

invite.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

list_account.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

list_feed.rb

…

list.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

media_attachment.rb

Remove unnecessary code from MediaAttachment#set_type_and_extension.

2018-05-04 02:38:04 -05:00

mention.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

mute.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

notification.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

preview_card.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

remote_follow.rb

Using double splat operator (#5859 )

2017-12-06 11:41:57 +01:00

remote_profile.rb

[WIP] Enable custom emoji on account pages and in the sidebar (#6124 )

2018-04-01 23:55:42 +02:00

report_filter.rb

…

report_note.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

report.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

search.rb

…

session_activation.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

setting.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

site_upload.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

status_pin.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

status.rb

Merge remote-tracking branch 'tootsuite/master' into merge-upstream

2018-06-07 05:13:49 -05:00

stream_entry.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

subscription.rb

Update dependencies for Ruby (2018-04-23) (#7237 )

2018-04-23 11:29:17 +02:00

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-05-27 13:20:15 +02:00

web.rb

…