Baptiste Lemoine 6e9a6e82d6 Merge branch 'merged-master'

2020-07-17 21:00:06 +02:00

..

controllers

Merge branch 'merged-master'

2020-07-17 21:00:06 +02:00

fabricators

Merge branch 'master' of https://framagit.org/tykayn/mastodon into merged-master

2020-07-17 20:49:44 +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

🐛 add icons in dropdown menu, fix style for this dropdown

2020-04-09 17:33:58 +02:00

lib

Fix boosted toots from blocked account not being retroactively removed from TL (#14339)

2020-07-17 07:07:54 +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' of https://framagit.org/tykayn/mastodon into merged-master

2020-07-17 20:49:44 +02:00

policies

Change admin UI for hashtags and add back whitelisted trends (#11490)

2019-08-05 19:54:29 +02:00

presenters

Admission-based registrations mode (#10250)

2019-03-14 05:28:30 +01:00

requests

⚡ merge with gh master

2019-12-02 16:35:37 +01:00

routing

prototype for groups

2019-08-27 17:05:17 +02:00

serializers/activitypub

Fix account URI in UpdatePollSerializer (#11194)

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

services

Fix removing allowed domains being done synchronously (#14302)

2020-07-15 21:08:19 +02:00

support

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

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

validators

Merge branch 'master' of https://github.com/tootsuite/mastodon

2020-02-12 10:03:28 +01:00

views

prototype for groups

2019-08-27 17:05:17 +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