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

Thibaut Girka 45709d6987 Merge branch 'master' into glitch-soc/master ... Conflicts: - `README.md`: We have different README files. Discarded upstream changes. - `app/views/layouts/admin.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `app/views/layouts/embedded.html.haml`: Conflict due to glitch-soc theming system. Adapted upstream changes. - `yarn.lock`: No real conflict, glitch-specific dependency too close to an updated one. Adapted upstream change.		2020-01-20 15:00:22 +01:00
..
chewy	Fix needlessly indexing unsearchable statuses into ElasticSearch (#12041)	2019-10-02 20:04:46 +02:00
controllers	Merge branch 'master' into glitch-soc/master	2020-01-20 15:00:22 +01:00
helpers	Merge branch 'master' into glitch-soc/master	2020-01-20 15:00:22 +01:00
javascript	Merge branch 'master' into glitch-soc/master	2020-01-20 15:00:22 +01:00
lib	Merge branch 'master' into glitch-soc/master	2020-01-20 15:00:22 +01:00
mailers	Split AccountsHelper from StatusesHelper (#12078)	2019-10-24 22:50:09 +02:00
middleware	Fix uncaught query param encoding errors (#12741)	2020-01-02 17:14:58 +01:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-13 13:14:35 +01:00
policies	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-06 13:16:53 +02:00
presenters	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-30 17:29:44 +01:00
serializers	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-04 23:04:42 +01:00
services	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-12 15:57:34 +01:00
validators	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-12 15:57:34 +01:00
views	Merge branch 'master' into glitch-soc/master	2020-01-20 15:00:22 +01:00
workers	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-12 15:57:34 +01:00