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

Conflicts:
- `Gemfile`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `Gemfile.lock`:
  We updated httplog in a separate commit.
  Took upstream's change which updated it further.
- `app/lib/sanitize_config.rb`:
  Upstream added better unsupported link stripping,
  while we had different sanitizing configs.
  Took only upstream's link stripping code.
- `config/locales/simple_form.pl.yml`:
  Strings unused in glitch-soc had been removed from
  glitch-soc, reintroduced them even if they are not
  useful, to reduce the risk of later merge conflicts.

2020-02-09 12:15:55 +01:00

..

v1

Merge branch 'master' into glitch-soc/merge-upstream

2020-02-03 09:22:58 +01:00

v2

Merge branch 'master' into glitch-soc/merge-upstream

2019-09-30 12:23:57 +02:00

web

Fix malformed HTML causing uncaught error (#13042)

2020-02-07 15:24:22 +01:00

base_controller.rb

Add announcements (#12662)

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

oembed_controller.rb

Fix OEmbed leaking information about existence of non-public statuses (#12930)

2020-01-24 00:20:51 +01:00

proofs_controller.rb

Fix proofs API being inaccessible in secure mode (#12495)

2019-11-28 04:07:49 +01:00