Thibaut Girka 53b7bb9d04 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	app/controllers/api/v1/mutes_controller.rb
	config/locales/simple_form.pl.yml

2018-08-27 18:09:28 +02:00

..

account_avatar.rb

…

account_finder_concern.rb

…

account_header.rb

Redesign public profiles and toots (#8068)

2018-07-28 19:25:33 +02:00

account_interactions.rb

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-10 16:22:31 +02:00

attachmentable.rb

Restore support to ruby 2.3, add ruby 2.3 to circle ci (#7935)

2018-07-03 19:47:09 +02:00

cacheable.rb

Fix cache_associated no longer working (#7320)

2018-05-03 10:41:41 +02:00

expireable.rb

Fix low-hanging rubocop gripes (#8458)

2018-08-26 19:22:46 +02:00

omniauthable.rb

…

paginable.rb

…

relationship_cacheable.rb

…

remotable.rb

Fix fetch of remote image with multiple Content-Type headers (#7749)

2018-06-06 20:50:07 +02:00

status_threading_concern.rb

Fix context performance by partially reverting #7083 (#7734)

2018-06-04 22:20:12 +02:00

streamable.rb

…