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

..

account_avatar.rb

Validate HTTP response length while receiving (#6891)

2018-03-26 14:02:10 +02:00

account_finder_concern.rb

Fix UniqueUsernameValidator comparison (#6926)

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

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

Add additional first_name and last_name SAML attribute statement options, and modify Omniauthable concern to use full_name or first_name + last_name if not available (#6669)

2018-03-07 06:19:10 +01:00

paginable.rb

Fix timeline pagination (#8827)

2018-09-29 19:03:33 +02:00

relationship_cacheable.rb

Cache relationships in API (#6482)

2018-02-18 03:14:46 +01:00

remotable.rb

Fix nil host in remotable (#8508)

2018-08-29 21:13:49 +02:00

status_threading_concern.rb

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

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

streamable.rb

Define instance method outside #included (#3128)

2017-05-19 11:41:45 +02:00