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 c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.		5 years ago
..
about	…
accounts	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
admin	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
admin_mailer	…
application	…
auth	Fix invite request input not being shown on sign-up error if left empty (#13089)	5 years ago
authorize_interactions	Fix misleading error when attempting to re-send a pending follow request (#13133)	5 years ago
directories	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
errors	Add specific rate limits for posting and following (#13172)	5 years ago
filters	Various fixes and improvements (#12878)	5 years ago
follower_accounts	…
following_accounts	…
home	…
invites	…
kaminari	…
layouts	Merge branch 'master' into glitch-soc/master	5 years ago
media	…
notification_mailer	…
oauth	…
public_timelines	…
relationships	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
remote_follow	…
remote_interaction	…
settings	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
shared	…
shares	…
statuses	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
tags	…
user_mailer	…
well_known/host_meta	…