219 Commits (db7e974589681e7fa04435918463b35da6c56191)

Author SHA1 Message Date
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
Alexander 23ce0c86da pam authentication (#5303)
7 years ago
Rob Watson 564e2c448b Upgrade Paperclip > 5.2.1 (#6404)
7 years ago
Jenkins 3cd4a0804b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 0efaa528c4 Update goldfinger, ostatus2 and http.rb versions (#6337)
7 years ago
David Yip a95ca95b7b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Aboobacker MK a1979b50c9 Redirect to 2FA creation page when otp_secret is not available (#6314)
7 years ago
David Yip d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi 2df7c3a008 Add support Ruby v2.5.0 (#6097)
7 years ago
David Yip de7283a318 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 9613c3238c HTML e-mails for UserMailer (#6256)
7 years ago
Jenkins 796a39a283 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 321be04a5f Fix OpenSSL dependency in ostatus2 (#6174)
7 years ago
Jenkins b42e6973a1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 3c20cfd734 Add confirmation step for email changes (#6071)
7 years ago
Jenkins 0a2cc2361c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
beatrix e2ccf65789 add ruby-progressbar to gemfile (fixes #6110) (#6111)
7 years ago
beatrix bc9421631b Merge pull request #263 from KnzkDev/optimize-paperclip
7 years ago
ncls7615 6fb6b1eb5d optimize paperclip
7 years ago
Yamagishi Kazutoshi f76681ebd6 Revert fog-aws (ref #5604) (#5934)
7 years ago
Eugen Rochko b037fbf9f4 Remove rabl dependency (#5894)
7 years ago
Yamagishi Kazutoshi e3ab149f97 Update dependencies for Ruby (2017-12-03) (#5878)
7 years ago
Yamagishi Kazutoshi a624688ebd Unify file upload to using fog (#5604)
7 years ago
K.SHIRAKASHI f066d2418a Revert ruby-jwt version (#5575)
7 years ago
Yamagishi Kazutoshi 10b30bd94e Update dependencies for Ruby (2017-10-30) (#5566)
7 years ago
abcang 7c1f3173bb Close connection when succeeded posting (#5390)
7 years ago
Eugen Rochko 6033b8eac1 Replace self-rolled statsd instrumention with localshred/nsa (#5118)
7 years ago