Thibaut Girka a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.		2019-01-10 21:00:30 +01:00
..
0_post_deployment_migrations.rb	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
1_hosts.rb	Set Content-Security-Policy rules through RoR's config (#8957)	2018-10-11 20:35:46 +02:00
active_model_serializers.rb	Disable AMS logging (#7623)	2018-05-26 01:08:31 +02:00
application_controller_renderer.rb	…
assets.rb	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
backtrace_silencers.rb	…
blacklists.rb	…
chewy.rb	Fix #6509: Use pull queue for chewy jobs (#6513)	2018-02-20 17:25:16 +01:00
content_security_policy.rb	Remove form_action from CSP	2018-12-14 08:02:06 +01:00
cookies_serializer.rb	…
cors.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-15 10:45:53 +01:00
delivery_job.rb	Skip mailer job retries when a record no longer exists (#9590)	2018-12-21 06:16:17 +01:00
devise.rb	feat(cookies): Use the same-site attribute to lax (#8626)	2018-09-08 23:54:28 +02:00
doorkeeper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
fast_blank.rb	…
ffmpeg.rb	add ffmpeg initializer (#8855)	2018-10-09 03:02:52 +02:00
filter_parameter_logging.rb	…
http_client_proxy.rb	lint pass 2 (#8878)	2018-10-04 17:38:04 +02:00
httplog.rb	…
inflections.rb	Add ActivityPub inbox (#4216)	2017-08-08 21:52:15 +02:00
instrumentation.rb	…
json_ld.rb	Preload common JSON-LD contexts (#9412)	2018-12-02 16:46:13 +01:00
kaminari_config.rb	adjust public profile pages 2 (#5223)	2017-10-04 22:49:36 +02:00
locale.rb	Ruby intl8n for themes	2017-12-10 11:08:04 -08:00
mime_types.rb	Set correct content-type for ActivityPub JSON (#4592)	2017-08-14 04:16:43 +02:00
oj.rb	Remove rabl dependency (#5894)	2017-12-06 15:04:49 +09:00
omniauth.rb	lint pass 2 (#8878)	2018-10-04 17:38:04 +02:00
open_uri_redirection.rb	rubocop issues - Cleaning up (#8912)	2018-10-08 04:50:11 +02:00
pagination.rb	…
paperclip.rb	Enable immutable caching for S3 objects (#9722)	2019-01-05 12:29:53 -05:00
premailer_rails.rb	HTML e-mails for UserMailer (#6256)	2018-01-16 03:29:11 +01:00
rack_attack.rb	Add REST API for creating an account (#9572)	2018-12-24 19:12:38 +01:00
rack_attack_logging.rb	Log rate limit hits (#7096)	2018-04-10 01:20:18 +02:00
redis.rb	Set config.cache_store in environments file. (#3219)	2017-05-22 15:01:02 +02:00
session_activations.rb	Revocable sessions (#3616)	2017-06-23 18:50:53 +02:00
session_store.rb	feat(cookies): Use the same-site attribute to lax (#8626)	2018-09-08 23:54:28 +02:00
sidekiq.rb	lint pass 2 (#8878)	2018-10-04 17:38:04 +02:00
simple_form.rb	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
single_user_mode.rb	…
statsd.rb	Fix that Rails.cache information could not be sent via StatsD (#8831)	2018-09-30 00:05:59 +02:00
stoplight.rb	Add a circuit breaker for ActivityPub deliveries (#7053)	2018-04-07 21:36:58 +02:00
strong_migrations.rb	Fix migration failure due to StrongMigrations on production env (#5283)	2017-10-09 10:05:35 +02:00
suppress_csrf_warnings.rb	Suppress CSRF token warnings (#6240)	2018-01-15 06:51:23 +01:00
trusted_proxies.rb	…
twitter_regex.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
vapid.rb	Lint pass (#8876)	2018-10-04 12:36:53 +02:00
wrap_parameters.rb	…