108 Commits (87d7e80a8efb3162890ef1f9e0fdb9d6ff5899a6)

Author SHA1 Message Date
Thibaut Girka 46259a36d0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 3ede0e8b95 Fix missing protocol in dns-prefetch, improve code style (#8963)
6 years ago
Thibaut Girka 74e411f4e8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko c9b5168ebd Add conversations API (#8832)
6 years ago
Thibaut Girka f627ea99e4 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
aus-social c883b1ffc9 lint pass 2 (#8878)
6 years ago
Thibaut Girka ae5c237607 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
luzpaz 1bce70d3c7 Misc. typos (#8694)
6 years ago
Thibaut Girka 563a09d81a Move CSP headers to the appropriate Rails configuration
6 years ago
David Yip c87f1d99e4 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 0370c0f4d6 Add support for separate Redis for cache (#7272)
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
Jenkins b1453c0dbf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki a4d7afa3d9 Fix i18n fallback configuration conflicts with environment configurations (#6843)
7 years ago
Jenkins 54608d0486 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 649565e005 Provide default OTP_SECRET value for development environment (#6617)
7 years ago
Akihiko Odaki 008bc9f47d Set the default locale in config (#6580)
7 years ago
David Yip c08c971dd3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
beatrix caa0e2e2f8 remove Uglifier call from production.rb (#6568)
7 years ago
Akihiko Odaki a5a434a8f6 Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)
7 years ago
Jenkins e768ef35b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki ca6c8b92d9 Isolate each specs for cache store (#6450)
7 years ago
beatrix d3e325e047 change referrer policy to same-origin
7 years ago
beatrix-bitrot 6a5b778bb8 tighten csp
7 years ago
beatrix 0daa95befb add memorial to production.rb
7 years ago
kibigo! 02827345ae Merge upstream 2.0ish #165
7 years ago
Eugen Rochko 6033b8eac1 Replace self-rolled statsd instrumention with localshred/nsa (#5118)
7 years ago
David Yip f90abccf33 Merge tag 'v1.6.0' into sync/upstream
7 years ago
Yamagishi Kazutoshi 4c0a563c0c Set fallback address when empty notification address (#4868)
7 years ago
David Yip da3f22ee7d Merge branch 'origin/master' into sync/upstream
7 years ago
Eugen Rochko 651c659fd6 Update status embeds (#4742)
7 years ago
Ondřej Hruška 713938f266 Updated from tootsuite
7 years ago
Eugen Rochko 49ef5145ea Add SMTP_TLS variable for configuring TLS when server uses non-standard port (#4227)
7 years ago
kibigo! f48f42598f Merge upstream (#81)
7 years ago
Sorin Davidoi ecab38fd66 Web Push Notifications (#3243)
7 years ago
kibigo! bcc30c8697 Merge upstream!! #64 <3 <3
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 9669f065af Set default From address in config (#3756)
7 years ago
beatrix-bitrot 4f54d53a84 update local modifications for cors and cp
7 years ago
nullkal 9335e15763 Support multiple trusted proxy ip addresses (#3639)
8 years ago
Matt Jankowski eea027c5c2 Update Rails to version 5.1.1 (#3121)
8 years ago
Clworld 2214d1ecd7 Set config.cache_store in environments file. (#3219)
8 years ago
Eugen Rochko 47fb42be01 Add back stdout logging to development environment after rails_12factor was removed (#3011)
8 years ago
alpaca-tc 4a4e6f59ec Remove rails_12factor (#2901)
8 years ago
Eugen Rochko 78b890cc81 Fix Scheduler::SubscriptionsScheduler (#2834)
8 years ago
Eugen Rochko c32e312061 More robust PuSH subscription refreshes (#2799)
8 years ago
Eugen Rochko 0951a2f9f3 Clean up redis configuration. Allow using REDIS_URL to set advanced (#2732)
8 years ago
Eugen Rochko ef2af79a48 Replace sprockets/browserify with Webpack (#2617)
8 years ago