mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-02 13:04:37 +00:00
24e83246f9
Conflicts: - `app/models/status.rb`: Upstream updated media and edit-related code textually close to glitch-soc additions (local-only and content-type). Ported upstream changes. - `app/models/status_edit.rb`: Upstream changes textually close to glitch-soc additions (content-type). Ported upstream changes. - `app/serializers/activitypub/note_serializer.rb`: Upstream changed how media attachments are handled. Not really a conflict, but textually close to glitch-soc additions (directMessage attribute). Ported upstream changes. - `app/services/remove_status_service.rb`: Upstream changed how media attachments are handled. Not really a conflict, but textually close to glitch-soc additions (DM timeline). Ported upstream changes. - `app/services/update_status_service.rb`: Upstream fixed an issue with language selection. Not really a conflict, but textually close to glitch-soc additions (content-type). Ported upstream changes. - `db/schema.rb`: Upstream added columns to the `status_edits` table, the conflict is because of an additional column (`content-type`) in glitch-soc. Ported upstream changes. - `package.json`: Upstream dependency (express) textually adjacent to a glitch-soc-specific one (favico.js) got updated. Updated it as well. |
||
---|---|---|
.. | ||
0_duplicate_migrations.rb | ||
0_post_deployment_migrations.rb | ||
1_hosts.rb | ||
2_whitelist_mode.rb | ||
active_model_serializers.rb | ||
application_controller_renderer.rb | ||
assets.rb | ||
backtrace_silencers.rb | ||
blacklists.rb | ||
cache_buster.rb | ||
chewy.rb | ||
content_security_policy.rb | ||
cookies_serializer.rb | ||
cors.rb | ||
devise.rb | ||
doorkeeper.rb | ||
fast_blank.rb | ||
ffmpeg.rb | ||
filter_parameter_logging.rb | ||
http_client_proxy.rb | ||
httplog.rb | ||
inflections.rb | ||
json_ld.rb | ||
kaminari_config.rb | ||
locale.rb | ||
mail_delivery_job.rb | ||
makara.rb | ||
mime_types.rb | ||
oj.rb | ||
omniauth.rb | ||
open_uri_redirection.rb | ||
paperclip.rb | ||
permissions_policy.rb | ||
preload_link_headers.rb | ||
premailer_rails.rb | ||
rack_attack.rb | ||
rack_attack_logging.rb | ||
redis.rb | ||
session_activations.rb | ||
session_store.rb | ||
sidekiq.rb | ||
simple_form.rb | ||
single_user_mode.rb | ||
statsd.rb | ||
stoplight.rb | ||
strong_migrations.rb | ||
suppress_csrf_warnings.rb | ||
trusted_proxies.rb | ||
twitter_regex.rb | ||
vapid.rb | ||
webauthn.rb | ||
wrap_parameters.rb |