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

Conflicts:
- `app/controllers/relationships_controller.rb`:
  Upstream changed a line too close to a glitch-soc only line related to
  glitch-soc's theming system.
  Applied upstream changes accordingly.

2020-11-12 22:13:57 +01:00

..

controllers

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

2020-11-08 14:20:35 +01:00

fabricators

Add IP-based rules (#14963)

2020-10-12 16:33:49 +02:00

features

Add submit button to the top of preferences pages (#13068)

2020-03-08 16:04:03 +01:00

fixtures

Add noopener and/or noreferrer (#12202)

2019-10-24 22:44:42 +02:00

helpers

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

2020-04-04 21:47:37 +02:00

lib

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

2020-10-21 19:10:50 +02:00

mailers

refactor: add email previews for WebAuthn emails (#14658)

2020-08-25 01:21:11 +02:00

models

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

2020-11-12 22:13:57 +01:00

policies

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

2020-11-08 14:20:35 +01:00

presenters

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

2019-03-14 17:17:20 +01:00

requests

Fix localization test failing due to order of locale definitions (#12393)

2019-11-15 21:00:09 +01:00

routing

Move create/destroy actions for api/v1/statuses to namespace (#3678)

2017-06-10 09:39:26 +02:00

serializers/activitypub

Fix account URI in UpdatePollSerializer (#11194)

2019-06-27 19:41:55 +02:00

services

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

2020-11-08 14:20:35 +01:00

support

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

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

validators

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

2020-08-13 22:17:29 +02:00

views

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

2019-07-19 18:26:49 +02:00

workers

Add follower synchronization mechanism (#14510)

2020-10-21 18:04:09 +02:00

rails_helper.rb

Add WebAuthn as an alternative 2FA method (#14466)

2020-08-24 16:46:27 +02:00

spec_helper.rb

Move rspec examples to tmp dir (#12539)

2019-12-02 19:55:08 +01:00