about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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 branch 'master' into patch-1VirtuBox
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-05Update Production-guide.mdBen Field
Corrected spelling error for "install"
2017-04-05Add social.bytestemplar.com to instances listToby Deshane
2017-04-05Make scalingo doc clearerJonathan Hurter
2017-04-05Fix wrong url in scalingo.jsonJonathan Hurter
2017-04-05Added im-in.spaceKody
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 niu.moe, cuz it's kawaiiTechnowix
2017-04-05Update List-of-Mastodon-instances.mdVirtuBox
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
2017-04-05Adding mastodon.irishPadraig Fahy
2017-04-05Merge pull request #938 from wxcafe/patch-3Eugen
Updates description for `social.wxcafe.net`
2017-04-05Merge pull request #931 from farlistener/patch-3Eugen
Typography on partY
2017-04-05Merge pull request #936 from Angristan/patch-7Eugen
Add git and curl as dependencies
2017-04-05updated blocking translationJantso Porali
2017-04-05updated two-way auth and preferences translationJantso Porali
2017-04-05updated translation for about pageJantso Porali
2017-04-05Add node_modules and .cache to slugignoreJonathan Hurter
2017-04-05Only render public payload once in FanOutOnWriteEugen Rochko