about summary refs log tree commit diff
path: root/lib
AgeCommit message (Collapse)Author
2018-01-09Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-08Bump version to 2.1.3Eugen Rochko
2018-01-05Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-05Bump version to 2.1.2Eugen Rochko
2018-01-04Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-04Bump version to 2.1.1 (#6164)Eugen Rochko
2017-12-24Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-24Add rake task to check and purge accounts that are missing in origin (#6085)Eugen Rochko
* Add rake task to check and purge accounts that are missing in origin * Add progress bar and --force options to mastodon:maintenance:purge_removed_accounts
2017-12-16Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-16Merge pull request #253 from glitch-soc/prevent-local-only-federationbeatrix
prevent federation of local-only statuses
2017-12-15Remove period from the version number (#6039)Daigo 3 Dango
2.1.0. -> 2.1.0
2017-12-15Merge branch 'gs-master' into prevent-local-only-federationDavid Yip
Conflicts: db/schema.rb
2017-12-15Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-15Bump version to 2.1.0 🎆Eugen Rochko
2017-12-15Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-15Bump version to 2.1.0rc6Eugen Rochko
2017-12-13Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-13Bump version to 2.1.0rc5Eugen Rochko
2017-12-13Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-13Bump version to 2.1.0rc4Eugen Rochko
2017-12-12Merge remote-tracking branch 'tootsuite/master' into merge-upstreamDavid Yip
2017-12-10Add Rake task to backfill local-only flag (#253)David Yip
2017-12-09Bump version to 2.1.0rc3Eugen Rochko
2017-12-08Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-08Bump version to 2.1.0rc2Eugen Rochko
2017-12-07Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-07Add embed_url to preview cards (#5775)Akihiko Odaki
2017-12-06Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-06Bump version to 2.1.0rc1 (#5834)Eugen Rochko
2017-12-06Using double splat operator (#5859)Yamagishi Kazutoshi
2017-11-16Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-11-17Remove empty strings (#5732)ysksn
2017-11-16Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5Surinna Curtis
2017-11-11Add moderator role and add pundit policies for admin actions (#5635)Eugen Rochko
* Add moderator role and add pundit policies for admin actions * Add rake task for turning user into mod and revoking it again * Fix handling of unauthorized exception * Deliver new report e-mails to staff, not just admins * Add promote/demote to admin UI, hide some actions conditionally * Fix unused i18n
2017-11-08In remove_remote, exclude removed media attachments. (#5626)Naoki Kosaka
2017-10-26Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-10-26Fix Cocaine::ExitStatusError when upload small non-animated GIF (#5489)unarist
Looks like copied tempfile need to be flushed before further processing. This issue won't happen if the uploaded file has enough file size.
2017-10-18Merge tag 'v2.0.0' into gs-masterDavid Yip
2017-10-18Bump version to 2.0.0 🐘Eugen Rochko
2017-10-17Bump version to 2.0.0rc4Eugen Rochko
2017-10-16Merge remote-tracking branch 'upstream/master' into upstream-merge-againDavid Yip
2017-10-16Bump version to 2.0.0rc3Eugen Rochko
2017-10-11Merge remote-tracking branch 'upstream/master'Ondřej Hruška
2017-10-11Fix #5329 (#5332)aschmitz
This fixes #5329, which occurred when using MigrationHelpers on a table that Postgres estimated to be non-empty when it was actually empty.
2017-10-11Merge upstream 2.0ish #165kibigo!
2017-10-10Bump version to 2.0.0rc2Eugen Rochko
2017-10-09Fix #5274 - Create symlink from public/500.html to public/assets/500.html ↵Eugen Rochko
(#5288)
2017-10-08Bump version to 2.0.0rc1 (#5209)Eugen Rochko
2017-10-08Set snowflake IDs for backdated statuses (#5260)Eugen Rochko
- Rename Mastodon::TimestampIds into Mastodon::Snowflake for clarity - Skip for statuses coming from inbox, aka delivered in real-time - Skip for statuses that claim to be from the future
2017-10-07raise Mastodon::ValidationError if audio file duration is over 60 secsDJ Sundog