245 Commits (3c3e6d0e9b88c500dbb8ca258da11fc73c4ff4b1)

Author SHA1 Message Date
Thibaut Girka 7d5dbed502 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
MIYAGI Hikaru a922fb60f5 Fix posix-spawn to version 0.3.12 (#7517)
7 years ago
Thibaut Girka efd2441d1f Merge branch 'master' into glitch-soc/merge
7 years ago
Yamagishi Kazutoshi 15a8a75117 Update http_parser.rb to head version (#7467)
7 years ago
Yamagishi Kazutoshi a846656008 Downgrade doorkeeper to version 4.2.6 (#7456)
7 years ago
Thibaut Girka af504e62ff Merge branch 'master' into glitch-soc/master
7 years ago
Yamagishi Kazutoshi 9d64bcdac7 Port travis_retry for CI (#7379)
7 years ago
David Yip ea46024add Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 860701a9a8 Marginally improve convert/ffmpeg calls performance with posix-spawn (#7346)
7 years ago
David Yip c87f1d99e4 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Shuhei Kitagawa 7236e9effe Add pry-byebug (#7307)
7 years ago
Eugen Rochko ca1c696dbd Slightly reduce RAM usage (#7301)
7 years ago
Yamagishi Kazutoshi e83e74f36d Update dependencies for Ruby (2018-04-23) (#7237)
7 years ago
Yamagishi Kazutoshi 0d4342e146 Introduce rspec-retry (#7206)
7 years ago
David Yip fd98bfd108 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi 9761b940ac Upgrade Rails to version 5.2.0 (#5898)
7 years ago
David Yip ac1ac20ee9 Merge remote-tracking branch 'tootsuite/master'
7 years ago
Alexander 8a9da4c414 update gem, test pam authentication (#7028)
7 years ago
David Yip 337fc136fd Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko a814aa8e4d Add a circuit breaker for ActivityPub deliveries (#7053)
7 years ago
Jenkins 658440838b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Pierre-Morgan Gate ccacb263da Upgrade charlock_holmes to version 0.7.6 (#6966)
7 years ago
Jenkins ae55717f50 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 6daa722e87 Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807)" (#6808)
7 years ago
Jenkins a9bcd383b8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel e62904bcba Update sanitize and loofah (#6855)
7 years ago
Jenkins eba1b109db Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Alexander 4fc9827b69 bugfixes and gem update (#6831)
7 years ago
Eugen Rochko d35272245e Revert "Upgrade Paperclip to version 6.0.0" (#6807)
7 years ago
Yamagishi Kazutoshi cd6dee83a1 Upgrade Paperclip to version 6.0.0 (#6754)
7 years ago
Jenkins 54608d0486 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 3008a0f73a Upgrade chewy to version 5.0.0 (#6649)
7 years ago
David Yip c08c971dd3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Patrick Figel faa3fe644d Update omniauth-saml to 1.10 (#6587)
7 years ago
Eugen Rochko 9721b7746a Fix #942: Seamless LDAP login (#6556)
7 years ago
masarakki eed7c16ab0 remove-uglifier (#6561)
7 years ago
Akihiko Odaki a5a434a8f6 Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko f6884555d7 Account archive download (#6460)
7 years ago
Eugen Rochko c34ff9fb82 Fix avatar and header issues by using custom geometry detector (#6515)
7 years ago
David Yip 596deb050b Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 9b7490cede Save video metadata and improve video OpenGraph tags (#6481)
7 years ago
Jenkins bf93764ca0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko e8e6786d6f Interactive `rake mastodon:setup` task (#6451)
7 years ago
Jenkins 3a1f58e9eb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip 79f594fcba Introduce html2text for extracting plaintext from statuses. #236.
7 years ago
Eugen Rochko 7ca5a06505 Full-text search for authorized statuses (#6423)
7 years ago
David Yip 4f8122a98c Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 5322013f25 CAS + SAML authentication feature (#6425)
7 years ago
David Yip 6d1023b2e9 Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago