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 91bef4759f Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js		2018-09-19 21:46:01 +02:00
..
assets.rake	Do not fetch environment variables to determine default locale (#6618)	2018-03-04 10:00:46 +01:00
auto_annotate_models.rake	Improve RuboCop rules (compatibility to Code Climate) (#3636)	2017-06-08 13:24:28 +02:00
db.rake	Fix low-hanging rubocop gripes (#8458)	2018-08-26 19:22:46 +02:00
emojis.rake	Compress and combine emoji data (#5229)	2017-10-06 03:42:34 +02:00
glitchsoc.rake	Add Rake task to backfill local-only flag (#253)	2017-12-10 22:49:59 -06:00
mastodon.rake	Move more tasks to tootctl (#8675)	2018-09-14 17:42:22 +02:00
repo.rake	using mailto scheme in AUTHORS.md (#8663)	2018-09-10 02:01:03 +02:00
statistics.rake	add task to report code statistics (#2489)	2017-04-26 18:47:22 +02:00