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

Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields

2018-06-21 20:49:57 +02:00

..

account_avatar.rb

…

account_finder_concern.rb

Fix UniqueUsernameValidator comparison (#6926)

2018-03-27 04:33:57 +02:00

account_header.rb

…

account_interactions.rb

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-05-31 01:17:25 +00:00

attachmentable.rb

Create special case to prefer "jpeg" over "jpe" file extension (#7841)

2018-06-18 17:27:05 +02:00

cacheable.rb

Fix cache_associated no longer working (#7320)

2018-05-03 10:41:41 +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

…