Mastodon

History

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 )