tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77
Mastodon/app/models
History
Thibaut Girka 1682ac5717 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/following_accounts_controller.rb
  Conflicts were due to glitch-soc's theming system.
- app/javascript/packs/public.js
  Some code has been change upstream, but it has been
  moved to app/javascript/core/settings.js in glitch-soc.
  Applied the changes there.
2019-04-04 14:53:52 +02:00
..
admin
Add moderation warnings (#9519)
2018-12-22 20:02:09 +01:00
concerns
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-20 13:54:00 +01:00
form
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-01 21:28:31 +02: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_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
Admission-based registrations mode (#10250)
2019-03-14 05:28:30 +01:00
account_identity_proof.rb
squashed identity proof updates (#10375)
2019-03-28 18:01:09 +01:00
account_moderation_note.rb
…
account_pin.rb
…
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_preset.rb
Add moderation warnings (#9519)
2018-12-22 20:02:09 +01:00
account_warning.rb
Add moderation warnings (#9519)
2018-12-22 20:02:09 +01:00
account.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-04-01 21:28:31 +02:00
admin.rb
Add logging of admin actions (#5757)
2017-11-24 02:05:53 +01:00
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_mute.rb
…
conversation.rb
…
custom_emoji_filter.rb
Make custom emoji domains case insensitive #9351 (#9474)
2018-12-11 05:30:57 +01:00
custom_emoji.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
Export and import hide_notifications alongside user mutes (#10335)
2019-04-03 18:17:43 +02:00
favourite.rb
…
featured_tag.rb
Fix featured tag form not failing on failed tag validations (#10167)
2019-03-05 03:46:24 +01:00
feed.rb
Create Redisable#redis (#9633)
2019-02-02 19:11:38 +01:00
follow_request.rb
Fix MergeWorker being queued for remote users (#10355)
2019-03-24 12:36:26 +01:00
follow.rb
…
home_feed.rb
…
identity.rb
…
import.rb
Add option to overwrite imported data (#9962)
2019-02-03 03:59:51 +01:00
instance_filter.rb
Add domain search/filter to the "Federation" (/admin/instances) page (#10071)
2019-02-18 14:59:19 +01:00
instance.rb
Improve performance of list of blocked domains by caching counts (#10374)
2019-03-26 00:36:35 +01:00
invite_filter.rb
…
invite.rb
…
list_account.rb
…
list_feed.rb
…
list.rb
Add database support for list show-reply preferences
2018-11-28 14:46:07 +01:00
media_attachment.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-10 21:10:09 +01:00
mention.rb
…
mute.rb
…
notification.rb
Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401)
2019-03-28 04:44:59 +01:00
poll_vote.rb
Add optimistic lock to avoid race conditions when handling votes (#10196)
2019-03-06 19:53:57 +01:00
poll.rb
Add support for custom emojis in poll options (#10322)
2019-03-20 17:29:12 +01:00
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
…
report_filter.rb
…
report_note.rb
Fix scope latest of ReportNote (#9630)
2018-12-26 06:38:59 +01:00
report.rb
Set and store report URIs (#10303)
2019-03-17 15:34:56 +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
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
setting.rb
…
site_upload.rb
Improvements to image upload validation and creation (#10431)
2019-04-01 07:30:46 +02:00
status_pin.rb
…
status_stat.rb
Reset status cache when status_stat or media_attachment updates (#9119)
2018-10-28 06:42:34 +01:00
status.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-28 13:01:33 +01:00
stream_entry.rb
…
subscription.rb
…
tag.rb
Fix tagged param not being normalized before querying tags (#10249)
2019-03-13 13:02:13 +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-03-26 16:01:59 +01:00
web.rb
…