You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb		6 years ago
..
0_post_deployment_migrations.rb	Add post-deployment migration system (#8182)	6 years ago
1_hosts.rb	Set Content-Security-Policy rules through RoR's config (#8957)	6 years ago
active_model_serializers.rb	Remove unused ActivityPub `@context` values depending on response (#10378)	6 years ago
application_controller_renderer.rb	…
assets.rb	…
backtrace_silencers.rb	…
blacklists.rb	…
chewy.rb	…
content_security_policy.rb	Fix CSP when PAPERCLIP_ROOT_URL is set to a different host	6 years ago
cookies_serializer.rb	…
cors.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
delivery_job.rb	Skip mailer job retries when a record no longer exists (#9590)	6 years ago
devise.rb	Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819)	6 years ago
doorkeeper.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
fast_blank.rb	…
ffmpeg.rb	add ffmpeg initializer (#8855)	6 years ago
filter_parameter_logging.rb	…
http_client_proxy.rb	lint pass 2 (#8878)	6 years ago
httplog.rb	…
inflections.rb	…
instrumentation.rb	…
json_ld.rb	Preload common JSON-LD contexts (#9412)	6 years ago
kaminari_config.rb	…
locale.rb	…
mime_types.rb	…
oj.rb	…
omniauth.rb	cas_options :validate_url should be :service_validate_url (#10328)	6 years ago
open_uri_redirection.rb	rubocop issues - Cleaning up (#8912)	6 years ago
pagination.rb	…
paperclip.rb	Add timeouts for S3 (#9842)	6 years ago
premailer_rails.rb	…
rack_attack.rb	Fix undefined method error (#10868)	6 years ago
rack_attack_logging.rb	Bump rack-attack from 5.4.2 to 6.0.0 (#10599)	6 years ago
redis.rb	…
session_activations.rb	…
session_store.rb	Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819)	6 years ago
sidekiq.rb	lint pass 2 (#8878)	6 years ago
simple_form.rb	Change preferences page into appearance, notifications, and other (#10977)	6 years ago
single_user_mode.rb	…
statsd.rb	Fix that Rails.cache information could not be sent via StatsD (#8831)	6 years ago
stoplight.rb	Fix stoplight logging to stderr separate from Rails logger (#10624)	6 years ago
strong_migrations.rb	…
suppress_csrf_warnings.rb	…
trusted_proxies.rb	…
twitter_regex.rb	Fix URL linkifier grabbing full-width spaces and quotations (#9997)	6 years ago
vapid.rb	Lint pass (#8876)	6 years ago
wrap_parameters.rb	…