treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/spec
History
Thibaut Girka ae5c237607 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
..
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
fabricators Merge branch 'master' into glitch-soc/merge-upstream 2018-08-28 17:24:39 +02:00
features
…
fixtures Slightly reduce RAM usage (#7301) 2018-05-02 18:58:48 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-08-31 19:10:57 +02:00
mailers Account archive download (#6460) 2018-02-21 23:21:32 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
policies Add test to disallow remote users from fetching local-only toots 2018-07-31 15:41:04 +02:00
presenters Isolate each specs for cache store (#6450) 2018-02-17 22:35:05 +01:00
requests Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
routing
…
services Merge branch 'master' into glitch-soc/merge-upstream 2018-09-19 21:46:01 +02:00
support Remove empty strings (#5732) 2017-11-17 10:52:30 +09:00
validators Merge remote-tracking branch 'origin/master' into gs-master 2018-03-27 10:44:12 -05:00
views Merge branch 'master' into glitch-soc/merge-upstream 2018-08-31 19:10:57 +02:00
workers Lists (#5703) 2017-11-18 00:16:48 +01:00
rails_helper.rb feat(cookies): Use the same-site attribute to lax (#8626) 2018-09-08 23:54:28 +02:00
spec_helper.rb Disable simplecov on CircleCI (#7416) 2018-05-09 16:59:58 +02:00