Thibaut Girka c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Conflict due to upstream adding a new parameter (with_rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/services/post_status_service.rb`:
  Conflict due to upstream adding a new parameter (rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to us not exposing theme settings here (as we have
  a different flavour/skin menu).
  Took upstream change, while still not exposing theme settings.
- `config/webpack/shared.js`:
  Coding style fixes for a part we have rewritten.
  Discarded upstream changes.

2020-03-08 19:38:53 +01:00

..

0_duplicate_migrations.rb

Fix ActiveRecord::Migration.check_pending! failing because of duplicate migrations

2020-02-10 20:04:41 +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

2_whitelist_mode.rb

Add whitelist mode (#11291)

2019-07-30 11:10:46 +02:00

active_model_serializers.rb

Fix ActivityPub context not being dynamically computed (#11746)

2019-09-03 22:52:32 +02:00

application_controller_renderer.rb

Upgrade to Rails 5.0.0.1

2016-08-17 17:58:00 +02:00

assets.rb

HTML e-mails for UserMailer (#6256)

2018-01-16 03:29:11 +01:00

backtrace_silencers.rb

Initial commit

2016-02-20 22:53:20 +01:00

blacklists.rb

Quick best practice cleanup of views/helpers (#1546)

2017-04-12 18:24:18 +02:00

chewy.rb

Fix records not being indexed sometimes (#12024)

2019-10-01 01:19:11 +02:00

content_security_policy.rb

Add environment variable to specify extra data hosts

2020-02-06 12:15:15 +01:00

cookies_serializer.rb

Upgrade to Rails 5.0.0.1

2016-08-17 17:58:00 +02:00

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

✨ Add an LDAP Mail attribute config (#12053)

2019-12-01 18:52:21 +01:00

doorkeeper.rb

Fix resource_owner_from_credentials in Doorkeeper initializer (#12743)

2020-01-03 05:35:46 +01:00

fast_blank.rb

fix can toot whitespace (#2218)

2017-04-22 19:48:55 +02:00

ffmpeg.rb

add ffmpeg initializer (#8855)

2018-10-09 03:02:52 +02:00

filter_parameter_logging.rb

Added optional two-factor authentication

2017-01-27 20:35:16 +01:00

health_check.rb

Hide error message on /heath (#11947)

2019-09-24 20:28:25 +02:00

http_client_proxy.rb

lint pass 2 (#8878)

2018-10-04 17:38:04 +02:00

httplog.rb

Version bumps for ruby and misc gems (#1159)

2017-04-10 22:47:41 +02:00

inflections.rb

Add a nodeinfo endpoint (#12002)

2019-09-29 21:31:51 +02:00

json_ld.rb

Fix preloaded JSON-LD context for identity not being used (#12138)

2019-10-10 06:48:53 +02: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

cas_options :validate_url should be :service_validate_url (#10328)

2019-03-21 04:06:41 +01:00

open_uri_redirection.rb

rubocop issues - Cleaning up (#8912)

2018-10-08 04:50:11 +02:00

pagination.rb

Pagination improvements (#1445)

2017-04-11 01:11:41 +02:00

paperclip.rb

Fix base64-encoded file uploads not being possible (#12748)

2020-01-04 01:54:07 +01:00

premailer_rails.rb

HTML e-mails for UserMailer (#6256)

2018-01-16 03:29:11 +01:00

rack_attack_logging.rb

Bump rack-attack from 5.4.2 to 6.0.0 (#10599)

2019-05-03 16:16:11 +02:00

rack_attack.rb

Add specific rate limits for posting and following (#13172)

2020-03-08 15:17:39 +01: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

Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819)

2019-01-15 23:11:46 +01:00

sidekiq.rb

lint pass 2 (#8878)

2018-10-04 17:38:04 +02:00

simple_form.rb

Add announcements (#12662)

2020-01-23 22:00:13 +01:00

single_user_mode.rb

Add single user mode

2016-12-06 17:19:26 +01:00

statsd.rb

Remove unused StatsD code and expose StatsD as a global variable (#11232)

2019-07-02 11:34:39 +02:00

stoplight.rb

Fix stoplight logging to stderr separate from Rails logger (#10624)

2019-04-23 04:39:48 +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

Fix error

2017-01-22 23:07:31 +01:00

twitter_regex.rb

Add support for magnet: URIs (#12905)

2020-01-23 21:27:26 +01:00

vapid.rb

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

wrap_parameters.rb

Upgrade to Rails 5.0.0.1

2016-08-17 17:58:00 +02:00