tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
afa753a890197b188ddf7ba6a8493d4fe361d956
Mastodon/app/models
History
Thibaut Girka 9748f074a3 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/api/v1/timelines/public_controller.rb
- app/lib/feed_manager.rb
- app/models/status.rb
- app/services/precompute_feed_service.rb
- app/workers/feed_insert_worker.rb
- spec/models/status_spec.rb

All conflicts are due to upstream refactoring feed management and us having
local-only toots on top of that. Rewrote local-only toots management for
upstream's changes.
2020-09-08 16:26:47 +02:00
..
admin
Add ability to filter audit log in admin UI (#13381)
2020-04-03 13:06:34 +02:00
concerns
Make Array-creation behavior of Paginable more predictable (#14687)
2020-08-31 12:47:09 +02:00
form
Merge branch 'master' into glitch-soc/master
2020-08-11 19:19:27 +02:00
web
Bump doorkeeper from 5.3.3 to 5.4.0 (#13733)
2020-05-12 15:25:33 +02:00
account_alias.rb
Fix confusing error when failing to add an alias to an unknown account (#13480)
2020-04-15 20:33:53 +02:00
account_conversation.rb
Make Array-creation behavior of Paginable more predictable (#14687)
2020-08-31 12:47:09 +02:00
account_domain_block.rb
…
account_filter.rb
Add sorting by username, creation and last activity in moderation view (#13076)
2020-03-08 15:39:13 +01:00
account_identity_proof.rb
…
account_migration.rb
…
account_moderation_note.rb
…
account_note.rb
Add user notes on accounts (#14148)
2020-06-30 19:19:50 +02:00
account_pin.rb
…
account_stat.rb
Fix account counters being overwritten by parallel writes (#12045)
2019-10-02 04:59:37 +02:00
account_tag_stat.rb
…
account_warning_preset.rb
Add titles to warning presets in admin UI (#13252)
2020-03-12 17:57:59 +01:00
account_warning.rb
…
account.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-06-09 10:39:20 +02:00
admin.rb
…
announcement_filter.rb
Add announcements (#12662)
2020-01-23 22:00:13 +01:00
announcement_mute.rb
Add announcements (#12662)
2020-01-23 22:00:13 +01:00
announcement_reaction.rb
Add announcements (#12662)
2020-01-23 22:00:13 +01:00
announcement.rb
Change delivery failure tracking to work with hostnames instead of URLs (#13437)
2020-04-15 20:33:24 +02:00
application_record.rb
Fix records not being indexed sometimes (#12024)
2019-10-01 01:19:11 +02:00
backup.rb
Add announcements (#12662)
2020-01-23 22:00:13 +01:00
block.rb
…
bookmark.rb
Add announcements (#12662)
2020-01-23 22:00:13 +01:00
context.rb
…
conversation_mute.rb
…
conversation.rb
…
custom_emoji_category.rb
…
custom_emoji_filter.rb
Various fixes and improvements (#12878)
2020-01-20 15:55:03 +01:00
custom_emoji.rb
Add separate cache directory for non-local uploads (#12821)
2020-04-26 23:29:08 +02:00
custom_filter.rb
Add “account timeline” filter category (#12918)
2020-01-23 21:32:00 +01:00
device.rb
Add E2EE API (#13820)
2020-06-02 19:24:53 +02:00
direct_feed.rb
…
domain_allow.rb
…
domain_block.rb
Fix admin page crashing when trying to block an invalid domain name (#13884)
2020-06-01 03:47:20 +02:00
email_domain_block.rb
Add option to include resolved DNS records when blacklisting e-mail domains in admin UI (#13254)
2020-03-12 22:35:20 +01:00
encrypted_message.rb
Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)
2020-07-01 19:05:21 +02:00
export.rb
…
favourite.rb
Fix records not being indexed sometimes (#12024)
2019-10-01 01:19:11 +02:00
featured_tag.rb
…
feed.rb
…
follow_request.rb
Add specific rate limits for posting and following (#13172)
2020-03-08 15:17:39 +01:00
follow.rb
Add specific rate limits for posting and following (#13172)
2020-03-08 15:17:39 +01:00
home_feed.rb
Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)
2020-07-01 19:05:21 +02:00
identity.rb
…
import.rb
Fix csv upload (#13835)
2020-05-24 09:15:23 +02:00
instance_filter.rb
Various fixes and improvements (#12878)
2020-01-20 15:55:03 +01:00
instance.rb
…
invite_filter.rb
Various fixes and improvements (#12878)
2020-01-20 15:55:03 +01:00
invite.rb
…
list_account.rb
Add abilityto add oneself to lists (#12271)
2019-11-04 13:02:01 +01:00
list_feed.rb
…
list.rb
Add configuration option to filter replies in lists (#9205)
2020-09-01 13:31:28 +02:00
marker.rb
…
media_attachment.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-08-30 16:13:08 +02:00
mention.rb
…
message_franking.rb
Add E2EE API (#13820)
2020-06-02 19:24:53 +02:00
mute.rb
…
notification.rb
Add follow_request notification type (#12198)
2019-12-01 17:25:29 +01:00
one_time_key.rb
Add E2EE API (#13820)
2020-06-02 19:24:53 +02:00
poll_vote.rb
…
poll.rb
Only normalize local polls (#12515)
2019-12-01 17:24:33 +01:00
preview_card.rb
Bump rubocop from 0.86.0 to 0.88.0 (#14412)
2020-09-01 03:04:00 +02:00
public_feed.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-09-08 16:26:47 +02:00
relationship_filter.rb
Fix followings list order | Issue #13538 (#13676)
2020-05-08 20:17:16 +02:00
relay.rb
Fix enable/disable relay failures (#13535)
2020-04-23 22:04:18 +02:00
remote_follow.rb
Refactor monkey-patching of Goldfinger (#12561)
2020-05-10 11:41:43 +02:00
report_filter.rb
Various fixes and improvements (#12878)
2020-01-20 15:55:03 +01:00
report_note.rb
…
report.rb
Add rate limit for reporting (#13390)
2020-04-05 14:40:08 +02:00
scheduled_status.rb
…
search.rb
…
session_activation.rb
…
setting.rb
…
site_upload.rb
…
status_pin.rb
…
status_stat.rb
…
status.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-09-08 16:26:47 +02:00
system_key.rb
Add E2EE API (#13820)
2020-06-02 19:24:53 +02:00
tag_feed.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-09-08 16:26:47 +02:00
tag_filter.rb
Various fixes and improvements (#12878)
2020-01-20 15:55:03 +01:00
tag.rb
Changed tag most_used to recently_used (#14760)
2020-09-07 17:47:41 +02:00
tombstone.rb
…
trending_tags.rb
Fix admin setting to auto-approve hashtags not affecting query (#12130)
2019-10-10 02:22:04 +02:00
unavailable_domain.rb
Change delivery failure tracking to work with hostnames instead of URLs (#13437)
2020-04-15 20:33:24 +02:00
user_invite_request.rb
…
user.rb
Merge branch 'master' into glitch-soc/merge-upstream
2020-09-01 17:02:18 +02:00
web.rb
…
webauthn_credential.rb
Add WebAuthn as an alternative 2FA method (#14466)
2020-08-24 16:46:27 +02:00