about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-07Merge pull request #1146 from tootsuite/fix-object-type-nil-exceptionEugen
Fix nil#object_type error
2017-04-07Merge pull request #1145 from tootsuite/feature-customized-default-localeEugen
Allow setting of default language through config
2017-04-07Merge branch 'master' into fix-object-type-nil-exceptionEugen
2017-04-07Merge branch 'master' into feature-customized-default-localeEugen
2017-04-07Fix nil#object_type errorEugen Rochko
2017-04-07Update Finnish translations, add sample Minio config (#954)Jantso Porali
2017-04-07Allow setting of default language through configEugen Rochko
Setting of locale in controller extracted to Localized concern, the doorkeeper authorized applications controller moved under custom namespace with inclusion of Localized, which resolves the "it sometimes appears in a different random language" bug
2017-04-07Re-add forgotten <author> element on standalone <entry>Eugen Rochko
2017-04-07Force UTF8 encoding on generated XML (#1140)Eugen
2017-04-07Rewrite Atom generation from stream entries to use Ox instead of Nokogiri ↵Eugen
(#1124) * Rewrite Atom generation from stream entries to use Ox instead of Nokogiri::Builder StreamEntry is now limited to only statuses, which allows some optimization. Removed extra queries on AccountsController#show. AtomSerializer instead of AtomBuilderHelper used in AccountsController#show, StreamEntriesController#show, StreamEntryRenderer and PubSubHubbub::DistributionWorker PubSubHubbub::DistributionWorker moves n+1 DomainBlock query to PubSubHubbub::DeliveryWorker instead. All Salmon slaps that aren't based on StreamEntry still use AtomBuilderHelper and Nokogiri * All Salmon slaps now use Ox instead of Nokogiri. No touch from status on account
2017-04-07Low-hanging fruit of query optimization, these indices were missingEugen Rochko
2017-04-06Merge pull request #1100 from mjankowski/mj-reduce-image-sizeEugen
Reduce size of background-photo.jpeg
2017-04-06Merge pull request #1103 from alimony/vagrant-tweaks-01Eugen
Add a couple of network performance tweaks to Vagrantfile.
2017-04-06Add a couple of network performance tweaks to Vagrantfile.Markus Amalthea Magnuson
2017-04-06Reduce size of background-photo.jpegMatt Jankowski
Reduced by running through `guetzli` image optimizer.
2017-04-06Merge pull request #1088 from Wonderfall/masterEugen
Add metadata to Dockerfile
2017-04-06add Docker microbadger to README.mdWonderfall
2017-04-06add metadata to DockerfileWonderfall
2017-04-06Merge pull request #1038 from wade-r/optimize-dockerfileEugen
Optimize Dockerfile
2017-04-06Merge pull request #1042 from johnsudaar/feature/scalingo_one_clickEugen
Cosmetic changes to the scalingo deployment
2017-04-06Merge pull request #1048 from ashfurrow/slugignoreEugen
Updates slugignore
2017-04-06Merge pull request #1070 from alexgleason/patch-4Eugen
Linux users must enable NFS for Vagrant
2017-04-06Linux users must enable NFS for VagrantAlex Gleason
2017-04-06Updates slugignore.Ash Furrow
2017-04-06Optimize DockerfileRyan Wade
Optimize Dockerfile, reduce build time.
2017-04-06Fix wrong pubsub channel on public timelinesEugen Rochko
2017-04-06Merge pull request #1013 from blackle/masterEugen
Catch more errors in process_follows so it doesn't fail
2017-04-06Fix notifications delivered to wrong pubsub channel, optimized ↵Eugen Rochko
RemoveStatusService, slightly optimized FanOutOnWriteService again
2017-04-05Catch more errors in process_follows so it doesn't failblackle
2017-04-05Merge pull request #993 from foozmeat/patch-1Eugen
Use NFS for the shared folder because it dramatically decreases latency for git operations.
2017-04-05Split SalmonWorker into smaller parts, move profile updating into another jobEugen Rochko
2017-04-05Use NFS for the shared folder because it dramatically decreases latency for ↵James Moore
git operations.
2017-04-05Merge pull request #958 from yiskah/patch-1Eugen
Correct innacurate info and other fixes
2017-04-05Merge branch 'krainboltgreene-broadcast-to-worker'Eugen Rochko
2017-04-05Replace calls to FeedManager#inline_render and #broadcastEugen Rochko
2017-04-05Merge branch 'broadcast-to-worker' of ↵Eugen Rochko
https://github.com/krainboltgreene/mastodon into krainboltgreene-broadcast-to-worker
2017-04-05Make sure Rabl is using OjEugen Rochko
2017-04-05Fix wrong variable used in publish channelEugen
2017-04-05Add proper message to PushUpdateWorker, use redis directlyEugen
2017-04-05Merge branch 'master' into broadcast-to-workerEugen
2017-04-05Make scalingo doc clearerJonathan Hurter
2017-04-05Fix wrong url in scalingo.jsonJonathan Hurter
2017-04-05Correct innacurate info and other fixesshel
This guide was pretty out of date and also contained outright errors which were never true. I have updated it.
2017-04-05Merge pull request #947 from johnsudaar/feature/scalingo_one_clickEugen
Add Scalingo deployment support
2017-04-05Add docJonathan Hurter
2017-04-05Use root repository urlJonathan Hurter
2017-04-05Add Scalingo one click on readmeJonathan Hurter
2017-04-05Merge pull request #940 from fahy/patch-1Eugen
Adding mastodon.irish
2017-04-05Merge pull request #930 from nicobz25/patch-1Eugen
Update List-of-Mastodon-instances.md
2017-04-05Merge pull request #939 from JantsoP/masterEugen
More translation updates