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 ff67385cfb Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code		5 years ago
..
chewy	Fix needlessly indexing unsearchable statuses into ElasticSearch (#12041)	5 years ago
controllers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
javascript	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
mailers	Split AccountsHelper from StatusesHelper (#12078)	5 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
policies	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
presenters	Add bookmarks (#7107)	5 years ago
serializers	Add bookmarks (#7107)	5 years ago
services	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
validators	Increase poll option length limit to 100 chars, number of options to 5	5 years ago
views	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
workers	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago