Claire aaa9ec340b Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/formatter.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit. - `app/models/status.rb`: Upstream refactored status edit handling and moved code to `app/models/concerns/status_snapshot_concern.rb`. Applied glitch-soc's changes to that file. - `app/serializers/activitypub/note_serializer.rb`: Not really a conflict, just a line added too close to one modified by glitch-soc. Applied upstream changes while keeping the glitch-soc-modified one. - `app/services/update_status_service.rb`: Not really a conflict, upstream modified a line adjacent to one added by glitch-soc. Applied upstream changes while keeping the glitch-soc line. - `app/views/statuses/_simple_status.html.haml`: Upstream refactored formatting, glitch-soc changed the markup slightly. Applied upstream changes. - `spec/lib/formatter_spec.rb`: Upstream completely refactored the formatting code and removed that file, while glitch-soc had code for Markdown and HTML toots. Took upstream code, glitch-soc changes will be re-implemented on top of the refactored classes in a later commit.		2022-03-26 19:18:55 +01:00
..
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	Fix ElasticSearch to Elasticsearch (#17050)	2021-11-26 08:30:02 +01:00
content_security_policy.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-15 20:45:27 +01:00
cookies_serializer.rb
cors.rb
devise.rb	Remove IP tracking columns from users table (#16409)	2022-01-16 13:23:50 +01:00
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	Allow login through OpenID Connect (#16221)	2022-03-09 12:07:35 +01:00
open_uri_redirection.rb
paperclip.rb
permissions_policy.rb
pghero.rb	Fix PgHero suggesting migrations (#17807)	2022-03-15 20:27:49 +01:00
preload_link_headers.rb	Fix various typos (#17621)	2022-02-22 20:14:17 +01:00
premailer_rails.rb
rack_attack.rb	Bump rack-attack from 6.5.0 to 6.6.0 (#17405)	2022-03-12 09:23:53 +01:00
rack_attack_logging.rb
redis.rb
session_activations.rb
session_store.rb
sidekiq.rb	Fix warnings on Rails boot (#16946)	2021-12-27 00:47:20 +01:00
simple_form.rb
single_user_mode.rb
statsd.rb
stoplight.rb
strong_migrations.rb
suppress_csrf_warnings.rb
trusted_proxies.rb
twitter_regex.rb	Refactor formatter (#17828)	2022-03-26 02:53:34 +01:00
vapid.rb
webauthn.rb
wrap_parameters.rb