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 36393e1d2b Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.		6 years ago
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
features	Add scenarios for log in (#3497)	8 years ago
fixtures	Slightly reduce RAM usage (#7301)	7 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mailers	Account archive download (#6460)	7 years ago
models	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
policies	Add test to disallow remote users from fetching local-only toots	6 years ago
presenters	Isolate each specs for cache store (#6450)	7 years ago
requests	Use raw status code on have_http_status (#7214)	7 years ago
routing	Move create/destroy actions for api/v1/statuses to namespace (#3678)	8 years ago
services	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
support	Remove empty strings (#5732)	7 years ago
validators	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
views	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
workers	Lists (#5703)	7 years ago
rails_helper.rb	Slightly reduce RAM usage (#7301)	7 years ago
spec_helper.rb	Disable simplecov on CircleCI (#7416)	7 years ago