luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-01 20:45:56 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb
2018-10-01 12:43:20 +02:00
..
chewy Get rid of Chewy order/limit warning (#8355) 2018-08-22 02:44:56 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
mailers Fix low-hanging rubocop gripes (#8458) 2018-08-26 19:22:46 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2018-08-24 15:10:34 +02:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2018-09-20 18:36:00 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2018-07-26 21:22:43 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2018-10-01 12:43:20 +02:00
workers Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00