This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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.		2020-03-08 19:38:53 +01:00
..
assets	Add emoji autosuggest (#5053)	2017-09-23 14:47:32 +02:00
chewy/strategy	Fix records not being indexed sometimes (#12024)	2019-10-01 01:19:11 +02:00
devise	Fix authentication before 2FA challenge (#11943)	2019-09-24 04:35:36 +02:00
generators	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
json_ld	Fix preloaded JSON-LD context for identity not being used (#12138)	2019-10-10 06:48:53 +02:00
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-08 19:38:53 +01:00
paperclip	Fix ruby 2.7 warnings about keyword parameters (#12824)	2020-01-11 21:38:02 +01:00
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2020-02-29 12:20:54 +01:00
templates	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
cli.rb	Close registration before self-destruct (#12877)	2020-01-21 18:56:18 +01:00