about summary refs log tree commit diff
path: root/app/models/user.rb
AgeCommit message (Expand)Author
2018-05-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-27Validate that e-mail resolves with MX and it's not blacklisted (#7631)Eugen Rochko
2018-05-18Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-05-18Add preference to hide following/followers lists (#7532)Eugen Rochko
2018-05-11Merge branch 'master' into glitch-soc/mergeThibaut Girka
2018-05-11Add REST API for Web Push Notifications subscriptions (#7445)Eugen Rochko
2018-05-10Merge branch 'master' into glitch-soc/masterThibaut Girka
2018-05-05Store home feeds for 7 days instead of 14 (#7354)Eugen Rochko
2018-05-03Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-04-23Update dependencies for Ruby (2018-04-23) (#7237)Yamagishi Kazutoshi
2018-03-19Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-19bugfixes and gem update (#6831)Alexander
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-02Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-02-28Fix #942: Seamless LDAP login (#6556)Eugen Rochko
2018-02-26Ensure the app does not even start if OTP_SECRET is not set (#6557)Eugen Rochko
2018-02-23Merge branch 'master' of https://github.com/tootsuite/mastodonimncls
2018-02-21Account archive download (#6460)Eugen Rochko
2018-02-09Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-02-09Add preference to always display sensitive media (#6448)Eugen Rochko
2018-02-04Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-02-04Make PAM gem optional, allow configuration over environment (#6415)Eugen Rochko
2018-02-04CAS + SAML authentication feature (#6425)Eugen Rochko
2018-02-02Merge remote-tracking branch 'tootsuite/master' into merge-upstreamDavid Yip
2018-02-02pam authentication (#5303)Alexander
2018-01-24Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-23Fix #6331 (#6341)Eugen Rochko
2018-01-19Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-01-19Change belongs_to_required_by_default to true (#5888)Yamagishi Kazutoshi
2018-01-18Replace tutorial modal with welcome e-mail (#6273)Eugen Rochko
2018-01-15Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-15Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252)Eugen Rochko
2018-01-04Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-05Fix email confirmation link not updating email (#6187)Patrick Figel
2018-01-03Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-02Add confirmation step for email changes (#6071)Patrick Figel
2017-12-30Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2017-12-29Add more instance stats APIs (#6125)Eugen Rochko
2017-12-09add initial components based off of tootsuite pr #1507cwm
2017-12-04Merge branch 'gs-master' into glitch-themeDavid Yip
2017-12-03Rename themes -> flavours ? ?kibigo!
2017-11-30Skins supportkibigo!
2017-11-27Add consumable invites (#5814)Eugen Rochko
2017-11-18Lists (#5703)Eugen Rochko
2017-11-15Delegate some methods of User to @settings (#5706)ysksn
2017-11-12Update model annotations to use BIGINT for IDs (#5461)Daniel Hunsaker
2017-11-11Add moderator role and add pundit policies for admin actions (#5635)Eugen Rochko
2017-11-07Add ability to disable login and mark accounts as memorial (#5615)Eugen Rochko
2017-10-16Add option to reduce motion (#5393)Nolan Lawson