Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.		2018-08-10 16:22:31 +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	Keyword/phrase filtering (#7905)	2018-06-29 15:34:36 +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 prev/next links on public profile page (#6497)	2018-02-26 03:31:28 +01:00
relationship_cacheable.rb	Cache relationships in API (#6482)	2018-02-18 03:14:46 +01:00
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