about summary refs log tree commit diff
path: root/config/environments
AgeCommit message (Expand)Author
2021-03-19Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-03-17Prepare Mastodon for Rails 6 (#15911)Claire
2020-07-15Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2020-07-15add ssl option in smtp setting (#14309)Tdxdxoz
2019-09-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-09-02Add SMTP reply_to option (#11718)Hugo Gameiro
2019-08-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-08-18Add HTTP signature keyId to request log (#11591)Eugen Rochko
2018-10-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-12Fix missing protocol in dns-prefetch, improve code style (#8963)Eugen Rochko
2018-10-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-07Add conversations API (#8832)Eugen Rochko
2018-10-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-04lint pass 2 (#8878)aus-social
2018-09-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-09-14Misc. typos (#8694)luzpaz
2018-08-22Move CSP headers to the appropriate Rails configurationThibaut Girka
2018-05-03Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-04-27Add support for separate Redis for cache (#7272)Eugen Rochko
2018-04-13Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-04-12Upgrade Rails to version 5.2.0 (#5898)Yamagishi Kazutoshi
2018-04-12Merge remote-tracking branch 'tootsuite/master'David Yip
2018-04-11update gem, test pam authentication (#7028)Alexander
2018-03-20Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-20Fix i18n fallback configuration conflicts with environment configurations (#6...Akihiko Odaki
2018-03-09Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-04Provide default OTP_SECRET value for development environment (#6617)Akihiko Odaki
2018-03-04Set the default locale in config (#6580)Akihiko Odaki
2018-03-02Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-02-27remove Uglifier call from production.rb (#6568)beatrix
2018-02-24Raise Mastodon::HostValidationError when host for HTTP request is private (#6...Akihiko Odaki
2018-02-19Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-02-17Isolate each specs for cache store (#6450)Akihiko Odaki
2018-02-03change referrer policy to same-originbeatrix
2018-01-06tighten cspbeatrix-bitrot
2017-11-03add memorial to production.rbbeatrix
2017-10-11Merge upstream 2.0ish #165kibigo!
2017-09-29Replace self-rolled statsd instrumention with localshred/nsa (#5118)Eugen Rochko
2017-09-10Merge tag 'v1.6.0' into sync/upstreamDavid Yip
2017-09-09Set fallback address when empty notification address (#4868)Yamagishi Kazutoshi
2017-09-09Merge branch 'origin/master' into sync/upstreamDavid Yip
2017-08-30Update status embeds (#4742)Eugen Rochko
2017-07-17Updated from tootsuiteOndřej Hruška
2017-07-16Add SMTP_TLS variable for configuring TLS when server uses non-standard port ...Eugen Rochko
2017-07-15Merge upstream (#81)kibigo!
2017-07-13Web Push Notifications (#3243)Sorin Davidoi
2017-07-12Merge upstream!! #64 <3 <3kibigo!
2017-07-07Set default From address in config (#3756)Akihiko Odaki (@fn_aki@pawoo.net)
2017-06-23update local modifications for cors and cpbeatrix-bitrot
2017-06-08Support multiple trusted proxy ip addresses (#3639)nullkal