about summary refs log tree commit diff
path: root/lib
AgeCommit message (Collapse)Author
2018-03-09Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-08Bump version to 2.3.0rc3Eugen Rochko
2018-03-08After blocking domain with reject_media, invalidate cache (#6679)Eugen Rochko
Media attachments are part of the association cache of statuses, since they are presumed to be immutable. Unless this cache is cleared manually, the statuses will continue to look like they have media embedded.
2018-03-07Bump version to 2.3.0rc2Eugen Rochko
2018-03-06Fix #3807: Increase avatars to 400x400 max (#6651)Eugen Rochko
But do not upscale when they are smaller
2018-03-04Do not fetch environment variables to determine default locale (#6618)Akihiko Odaki
The default locale is now set by config.
2018-03-02Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml
2018-03-01Fixes #6584 (#6585)Thomas Leister
2018-03-01Bump version to 2.3.0rc1Eugen Rochko
2018-02-28Fix #942: Seamless LDAP login (#6556)Eugen Rochko
2018-02-26Some images can cause `convert` to fail, which crashes this whole task (#6565)Paul Woolcock
* Some images can cause `convert` to fail, which crashes this whole task * Add more specific exception
2018-02-26Ensure the app does not even start if OTP_SECRET is not set (#6557)Eugen Rochko
* Ensure the app does not even start if OTP_SECRET is not set * Remove PAPERCLIP_SECRET (it's not used by anything, actually) Imports are for internal consumption and the url option isn't even used correctly, so we can remove the hash stuff from them
2018-02-23Merge branch 'master' of https://github.com/tootsuite/mastodonimncls
# Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb
2018-02-22Fix #6525: Make sure file is opened in LazyThumbnail processor (#6529)Eugen Rochko
2018-02-21Account archive download (#6460)Eugen Rochko
* Fix #201: Account archive download * Export actor and private key in the archive * Optimize BackupService - Add conversation to cached associations of status, because somehow it was forgotten and is source of N+1 queries - Explicitly call GC between batches of records being fetched (Model class allocations are the worst offender) - Stream media files into the tar in 1MB chunks (Do not allocate media file (up to 8MB) as string into memory) - Use #bytesize instead of #size to calculate file size for JSON (Fix FileOverflow error) - Segment media into subfolders by status ID because apparently GIF-to-MP4 media are all named "media.mp4" for some reason * Keep uniquely generated filename in Paperclip::GifTranscoder * Ensure dumped files do not overwrite each other by maintaing directory partitions * Give tar archives a good name * Add scheduler to remove week-old backups * Fix code style issue
2018-02-21fix purge_removed_accounts task should suspend account before delete it (#6521)takayamaki
2018-02-21Fix avatar and header issues by using custom geometry detector (#6515)Eugen Rochko
* Fix avatar and header issues by using custom geometry detector Revert a part of #6508. The file passed to dynamic styles method was not actually a file, but an instance of Paperclip::Attachment, which broke all styles by always returning {} from the method. One problem with GIF avatars was that Paperclip::GeometryDetector reported wrong dimensions for them, e.g. 120x120 GIF avatar would for some reason be detected as 120x53. By writing our own geometry parser, we can use FastImage, which also happens to be faster than ImageMagick, to detect image dimensions, which are also correct. Unfortunately, this PR does not implement skipping a `convert` entirely if the dimensions are already correct, as I found no easy way to write that behaviour into Paperclip without rewriting the Paperclip::Thumbnail class. * Only invoke convert if dimension or format needs to be changed
2018-02-11Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-02-11Interactive `rake mastodon:setup` task (#6451)Eugen Rochko
* Add better CLI prompt * Add rake mastodon:setup interactive wizard * Test db/redis/smtp configurations and add admin user at the end * Test database connection even when database does not exist yet
2018-02-04Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-02-03Require environment for generate_static_pages (#6420)Akihiko Odaki
It is required for ApplicationController.
2018-01-28Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml
2018-01-29Bump version to 2.2.0Eugen Rochko
2018-01-29ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)Eugen Rochko
2018-01-24Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-24Bump to 2.2.0rc2Eugen Rochko
2018-01-24Fix #6311: Replace relative URLs in CSS only for Premailer (#6335)Eugen Rochko
2018-01-20Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/javascript/styles/mastodon/components.scss
2018-01-20Bump version to 2.2.0rc1Eugen Rochko
2018-01-20Improve HTML e-mails based on Litmus tests (#6301)Eugen Rochko
* Use PNG images in HTML e-mails * Make webpack use URLs with host so fonts load inside HTML e-mails Convert this back to a relative URL in the premailer CSS loader since local requests are quicker * Improve responsive design * Add missing PNG icon
2018-01-19Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss
2018-01-18Fix regeneration marker not expiring (#6290)Eugen Rochko
* Fix regeneration key not getting expired * Add rake task to remove old regeneration markers
2018-01-15Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: Gemfile.lock
2018-01-16HTML e-mails for UserMailer (#6256)Eugen Rochko
- premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates
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-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