Commit graph

1820 commits

Author SHA1 Message Date
Jantso Porali
fb0ce9d38d Update Finnish translations, add sample Minio config (#954) 2017-04-07 12:58:12 +02:00
Eugen Rochko
a1c63cb01d Re-add forgotten <author> element on standalone <entry> 2017-04-07 12:21:00 +02:00
Eugen
1781fcaea4 Force UTF8 encoding on generated XML (#1140) 2017-04-07 11:09:14 +02:00
Eugen
24c77e57b2 Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#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-07 05:56:56 +02:00
Eugen Rochko
b184c13102 Low-hanging fruit of query optimization, these indices were missing 2017-04-07 00:04:38 +02:00
Eugen
b2410a382a Merge pull request #1100 from mjankowski/mj-reduce-image-size
Reduce size of background-photo.jpeg
2017-04-06 22:59:48 +02:00
Eugen
de9e454ba5 Merge pull request #1103 from alimony/vagrant-tweaks-01
Add a couple of network performance tweaks to Vagrantfile.
2017-04-06 22:58:44 +02:00
Markus Amalthea Magnuson
ed4d3c53be Add a couple of network performance tweaks to Vagrantfile. 2017-04-06 22:34:59 +02:00
Matt Jankowski
7411863663 Reduce size of background-photo.jpeg
Reduced by running through `guetzli` image optimizer.
2017-04-06 16:24:57 -04:00
Eugen
b7d04bd252 Merge pull request #1088 from Wonderfall/master
Add metadata to Dockerfile
2017-04-06 21:35:10 +02:00
Wonderfall
9e2f235405 add Docker microbadger to README.md 2017-04-06 20:59:20 +02:00
Wonderfall
b2e3d99f82 add metadata to Dockerfile 2017-04-06 20:57:16 +02:00
Eugen
513456fa36 Merge pull request #1038 from wade-r/optimize-dockerfile
Optimize Dockerfile
2017-04-06 19:32:50 +02:00
Eugen
9df50099a1 Merge pull request #1042 from johnsudaar/feature/scalingo_one_click
Cosmetic changes to the scalingo deployment
2017-04-06 19:32:12 +02:00
Eugen
0d8e51ecb4 Merge pull request #1048 from ashfurrow/slugignore
Updates slugignore
2017-04-06 19:09:45 +02:00
Eugen
22de99ae87 Merge pull request #1070 from alexgleason/patch-4
Linux users must enable NFS for Vagrant
2017-04-06 19:02:14 +02:00
Alex Gleason
d1527b2d94 Linux users must enable NFS for Vagrant 2017-04-06 12:16:39 -04:00
Ash Furrow
07c9d0d108 Updates slugignore. 2017-04-06 07:53:48 -04:00
Ryan Wade
ff8f101023 Optimize Dockerfile
Optimize Dockerfile, reduce build time.
2017-04-06 15:42:16 +08:00
Eugen Rochko
0db2a0c7c4 Fix wrong pubsub channel on public timelines 2017-04-06 04:03:23 +02:00
Eugen
f10668da16 Merge pull request #1013 from blackle/master
Catch more errors in process_follows so it doesn't fail
2017-04-06 02:35:34 +02:00
Eugen Rochko
fb6459d303 Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService,
slightly optimized FanOutOnWriteService again
2017-04-06 02:26:59 +02:00
blackle
70f485a9e7 Catch more errors in process_follows so it doesn't fail 2017-04-05 20:04:13 -04:00
Eugen
1e33e5c67f Merge pull request #993 from foozmeat/patch-1
Use NFS for the shared folder because it dramatically decreases latency for git operations.
2017-04-05 23:26:44 +02:00
Eugen Rochko
cd68e54a7d Split SalmonWorker into smaller parts, move profile updating into another job 2017-04-05 21:43:10 +02:00
James Moore
3f54a0eca0 Use NFS for the shared folder because it dramatically decreases latency for git operations. 2017-04-05 11:53:39 -07:00
Eugen
afc48578a4 Merge pull request #958 from yiskah/patch-1
Correct innacurate info and other fixes
2017-04-05 20:48:19 +02:00
Eugen Rochko
c9116f673f Merge branch 'krainboltgreene-broadcast-to-worker' 2017-04-05 19:46:28 +02:00
Eugen Rochko
5189ce9cd1 Replace calls to FeedManager#inline_render and #broadcast 2017-04-05 19:45:18 +02:00
Eugen Rochko
21966f0af3 Merge branch 'broadcast-to-worker' of https://github.com/krainboltgreene/mastodon into krainboltgreene-broadcast-to-worker 2017-04-05 19:29:46 +02:00
Eugen Rochko
06e3d9bdd8 Make sure Rabl is using Oj 2017-04-05 19:29:30 +02:00
Eugen
54329947ab Fix wrong variable used in publish channel 2017-04-05 18:58:32 +02:00
Eugen
b9ddfff8f6 Add proper message to PushUpdateWorker, use redis directly 2017-04-05 18:48:41 +02:00
Eugen
d67e1fe44d Merge branch 'master' into broadcast-to-worker 2017-04-05 18:44:33 +02:00
Jonathan Hurter
f210b2b7ef Make scalingo doc clearer 2017-04-05 17:48:55 +02:00
Jonathan Hurter
2ecc791d9a Fix wrong url in scalingo.json 2017-04-05 17:28:11 +02:00
shel
fd0096f899 Correct innacurate info and other fixes
This guide was pretty out of date and also contained outright errors which were never true. I have updated it.
2017-04-05 10:58:41 -04:00
Eugen
b89f37e445 Merge pull request #947 from johnsudaar/feature/scalingo_one_click
Add Scalingo deployment support
2017-04-05 16:50:46 +02:00
Jonathan Hurter
8752dc9186 Add doc 2017-04-05 16:00:48 +02:00
Jonathan Hurter
18caabad8a Use root repository url 2017-04-05 15:52:06 +02:00
Jonathan Hurter
3c7acd0ab6 Add Scalingo one click on readme 2017-04-05 15:33:19 +02:00
Eugen
437bc1880b Merge pull request #940 from fahy/patch-1
Adding mastodon.irish
2017-04-05 15:24:52 +02:00
Eugen
676763dbc8 Merge pull request #930 from nicobz25/patch-1
Update List-of-Mastodon-instances.md
2017-04-05 15:24:40 +02:00
Eugen
10fa3627ea Merge pull request #939 from JantsoP/master
More translation updates
2017-04-05 15:24:24 +02:00
Padraig Fahy
9efa03d2be Adding mastodon.irish 2017-04-05 14:00:35 +01:00
Eugen
3a39a67901 Merge pull request #938 from wxcafe/patch-3
Updates description for `social.wxcafe.net`
2017-04-05 14:57:38 +02:00
Eugen
db522ed61a Merge pull request #931 from farlistener/patch-3
Typography on partY
2017-04-05 14:57:14 +02:00
Eugen
9c3c6f6e51 Merge pull request #936 from Angristan/patch-7
Add git and curl as dependencies
2017-04-05 14:57:01 +02:00
Jantso Porali
5c414eeb45 updated blocking translation 2017-04-05 14:53:35 +02:00
Jantso Porali
16d14e854b updated two-way auth and preferences translation 2017-04-05 14:49:29 +02:00