about summary refs log tree commit diff
path: root/spec/controllers
AgeCommit message (Expand)Author
2018-05-09Add tests for admin/invites_controller (#7412)Shuhei Kitagawa
2018-05-06Add resend confirmation for admin (#7378)Shuhei Kitagawa
2018-05-05Improve admin UI for accounts (#7360)Eugen Rochko
2018-05-05Add tests for admin/custom_emojis_controller (#7350)Shuhei Kitagawa
2018-05-03Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-05-02Serialize webfinger XML with Ox instead of Nokogiri (#7319)Eugen Rochko
2018-04-23Paginate descendant statuses in public page (#7148)Akihiko Odaki
2018-04-22Fix randomly fail (similar #7219) (#7225)Yamagishi Kazutoshi
2018-04-21Reset locale on registration tests (#7219)Yamagishi Kazutoshi
2018-04-21Use raw status code on have_http_status (#7214)Yamagishi Kazutoshi
2018-04-20Improve report layout (#7188)Eugen Rochko
2018-04-18Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-04-16Redirect to account status page for page of status stream entry (#7104)Akihiko Odaki
2018-04-13Merge pull request #419 from ThibG/glitch-soc/features/bookmarksDavid Yip
2018-04-12Merge remote-tracking branch 'tootsuite/master'David Yip
2018-04-11update gem, test pam authentication (#7028)Alexander
2018-04-11Add spec for bookmark endpointsThibaut Girka
2018-04-11Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-04-10Feature: Allow staff to change user emails (#7074)Emelia Smith
2018-04-08Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-04-08Enable updating additional account information from user preferences via rest...Levi Bard
2018-04-03Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-04-03Improve require_admin! and require_staff! filters (#7018)Emelia Smith
2018-04-02Feature: Report improvements (#6967) (#7000)Emelia Smith
2018-03-09Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-05Redirect from Web tag timeline to public tag timeline if not signed in (#6633)Akihiko Odaki
2018-03-04Set the default locale in config (#6580)Akihiko Odaki
2018-02-23Merge branch 'master' of https://github.com/tootsuite/mastodonimncls
2018-02-21Fix bug in relationships API introduced by #6482 (#6527)Eugen Rochko
2018-02-08Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-02-08Fix response of signature_verification_failure_reason (#6441)abcang
2018-01-24Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-22Rename ResolveRemoteAccountService to ResolveAccountService (#6327)Akihiko Odaki
2018-01-21Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-01-21Redirect to 2FA creation page when otp_secret is not available (#6314)Aboobacker MK
2018-01-19Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-01-18Fix regeneration marker not expiring (#6290)Eugen Rochko
2018-01-17Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-01-17Fix home regeneration (#6251)Eugen Rochko
2018-01-10Thank you, Officer MurphyDavid Yip
2018-01-10Add examples based on errors seen in #317David Yip
2018-01-08Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-08Revert #5772 (#6221)Eugen Rochko
2018-01-07Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-07Fix force_ssl conditional (#6201)Yamagishi Kazutoshi
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-03Allow to dereference Follow object for ActivityPub (#5772)Akihiko Odaki
2017-12-12Merge remote-tracking branch 'tootsuite/master' into merge-upstreamDavid Yip