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

Conflicts:
- `yarn.lock`:
  No real conflict, just a glitch-soc-only dependency textually too close to
  one updated upstream. Ported upstream changes.

2020-08-01 20:24:23 +02:00

..

controllers

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

2020-07-22 13:38:17 +02:00

fabricators

Change move handler to carry blocks over (#14144)

2020-07-01 13:51:15 +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-08-01 20:24:23 +02:00

mailers

Add e-mail-based sign in challenge for users with disabled 2FA (#14013)

2020-06-09 10:23:06 +02:00

models

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

2020-07-01 19:23:14 +02:00

policies

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

2019-08-06 13:16:53 +02: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-07-16 14:43:50 +02: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-02-03 09:22:58 +01:00

views

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

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

workers

Change move handler to carry blocks over (#14144)

2020-07-01 13:51:15 +02:00

rails_helper.rb

Bump sidekiq from 5.2.7 to 6.0.4 (#11727)

2020-03-21 12:04:54 +09:00

spec_helper.rb

Move rspec examples to tmp dir (#12539)

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