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

Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb

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

..

account_associations.rb

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

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

account_avatar.rb

Remove WebP support (#11589)

2019-08-17 22:04:15 +02:00

account_counters.rb

Add tootctl cache recount command (#11597)

2019-08-18 14:55:03 +02:00

account_finder_concern.rb

Add ActivityPub actor representing the entire server (#11321)

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

account_header.rb

Remove WebP support (#11589)

2019-08-17 22:04:15 +02:00

account_interactions.rb

…

attachmentable.rb

Include max image dimensions in error (#11552)

2019-08-15 20:20:20 +02:00

cacheable.rb

…

domain_normalizable.rb

Fix crash when saving invalid domain name (#11528)

2019-08-08 23:04:19 +02:00

expireable.rb

…

ldap_authenticable.rb

Fix authentication before 2FA challenge (#11943)

2019-09-24 04:35:36 +02:00

omniauthable.rb

Fix SSO login not using existing account when e-mail is verified (#11862)

2019-09-16 20:42:29 +02:00

paginable.rb

…

pam_authenticable.rb

…

redisable.rb

…

relationship_cacheable.rb

…

remotable.rb

Add retry for failed media downloads and tootctl media refresh (#11775)

2019-09-10 15:29:12 +02:00

status_threading_concern.rb

…

user_roles.rb

…