You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb		6 years ago
..
about	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
accounts	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
admin_mailer	Add invite request to pending account notification e-mail (#10528)	6 years ago
application	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
auth	Change unconfirmed user login behaviour (#11375)	6 years ago
authorize_interactions	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
directories	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
errors	…
filters	Redesign forms, verify link ownership with rel="me" (#8703)	6 years ago
follower_accounts	Improve blocked view of profiles (#10491)	6 years ago
following_accounts	Improve blocked view of profiles (#10491)	6 years ago
home	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
invites	Fix maxed-out invites not showing up as expired in UI (#10274)	6 years ago
kaminari	…
layouts	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
media	…
notification_mailer	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	6 years ago
oauth	Change unconfirmed user login behaviour (#11375)	6 years ago
public_timelines	[Glitch] Redesign landing page	6 years ago
relationships	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
remote_follow	Admission-based registrations mode (#10250)	6 years ago
remote_interaction	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
settings	Add option to disable real-time updates in web UI (#9984)	6 years ago
shared	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	6 years ago
shares	…
statuses	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
tags	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
user_mailer	Bump webpacker from 3.5.5 to 4.0.2 (#10277)	6 years ago
well_known	Add ActivityPub actor representing the entire server (#11321)	6 years ago