about summary refs log tree commit diff
path: root/app/models/concerns
AgeCommit message (Expand)Author
2018-11-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-11-24Sort self-replies to the top of descendants (#9320)Eugen Rochko
2018-11-23Revert "Sort self-replies to the top of the thread (#9296)" (#9335)Eugen Rochko
2018-11-19Extract counters from accounts table to account_stats table (#9295)Eugen Rochko
2018-11-16Sort self-replies to the top of the thread (#9296)Eugen Rochko
2018-11-16Remove intermediary arrays when creating hash maps from results (#9291)Eugen Rochko
2018-10-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-08rubocop issues - Cleaning up (#8912)ashleyhull-versent
2018-10-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-09-29Fix timeline pagination (#8827)Eugen Rochko
2018-09-28Support min_id-based pagination in REST API (#8736)Eugen Rochko
2018-08-31Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-29Fix nil host in remotable (#8508)Renato "Lond" Cerqueira
2018-08-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-26Fix low-hanging rubocop gripes (#8458)Quint Guvernator
2018-08-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-08-09Public profile endorsements (accounts picked by profile owner) (#8146)Eugen Rochko
2018-08-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-07-28Redesign public profiles and toots (#8068)Eugen Rochko
2018-07-09Merge branch 'master' into glitch-soc/tentative-mergeThibaut Girka
2018-07-07Add API method to remove a suggestion (#7978)Eugen Rochko
2018-07-03Restore support to ruby 2.3, add ruby 2.3 to circle ci (#7935)Renato "Lond" Cerqueira
2018-07-03Re-add follow recommendations API (#7918)Eugen Rochko
2018-06-29Keyword/phrase filtering (#7905)Eugen Rochko
2018-06-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-06-24Fix jpeg files sometimes being returned with a .jpe extension (#7881)ThibG
2018-06-21Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-06-18Create special case to prefer "jpeg" over "jpe" file extension (#7841)Eugen Rochko
2018-06-07Merge remote-tracking branch 'tootsuite/master' into merge-upstreamDavid Yip
2018-06-06Fix fetch of remote image with multiple Content-Type headers (#7749)Yamagishi Kazutoshi
2018-06-06Add missing dot for remote image (#7751)Yamagishi Kazutoshi
2018-06-04Fix context performance by partially reverting #7083 (#7734)nightpool
2018-06-04Detect extname from Content-Type (#7733)Yamagishi Kazutoshi
2018-05-31Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-05-29Reduce wasted work in RemoveStatusService due to inactive followers (#7672)Eugen Rochko
2018-05-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-29Rescue Mastodon::DimensionsValidationError in Remoteable (#7662)Eugen Rochko
2018-05-14Merge branch 'master' into glitch-soc/mergeThibaut Girka
2018-05-13Fix nil error in StatusFilter (#7470)Eugen Rochko
2018-05-11Merge branch 'master' into glitch-soc/mergeThibaut Girka
2018-05-11Catch Paperclip processing failures (fixes #6378) (#7439)ThibG
2018-05-04Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-05-04Store URIs of follows, follow requests and blocks for ActivityPub (#7160)Eugen Rochko
2018-05-03Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-05-03Fix n+1 queries in StatusThreadingConcern (#7321)Eugen Rochko
2018-05-03Fix cache_associated no longer working (#7320)Eugen Rochko
2018-05-02Keep notification when muting_notifications is true (#7311)abcang
2018-04-23Paginate descendant statuses in public page (#7148)Akihiko Odaki
2018-04-23Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)Eugen Rochko
2018-04-22Rescue Mastodon::LengthValidationError in Remoteable (#7228)Eugen Rochko