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

Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`
  conflict because of the poll option limit being different than upstream's

2019-11-07 13:43:56 +01:00

..

controllers

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

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

fabricators

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

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

features

Change unconfirmed user login behaviour (#11375)

2019-07-22 10:48:50 +02: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

2019-10-27 12:14:01 +01:00

lib

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

2019-11-06 14:38:28 +01:00

mailers

Add password challenge to 2FA settings, e-mail notifications (#11878)

2019-09-18 16:37:27 +02:00

models

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

2019-11-06 14:38:28 +01: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

Remove XML version of Webfinger and remove links to Atom feeds (#11460)

2019-08-01 19:14:02 +02: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

2019-10-27 12:14:01 +01:00

support

Remove empty strings (#5732)

2017-11-17 10:52:30 +09:00

validators

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

2019-08-06 13:16:53 +02:00

views

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

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

workers

Fix various issues with account migration (#12301)

2019-11-07 09:05:07 +02:00

rails_helper.rb

Fix records not being indexed sometimes (#12024)

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

spec_helper.rb

Add ActivityPub actor representing the entire server (#11321)

2019-07-19 01:44:42 +02:00