Commit graph

1796 commits

Author SHA1 Message Date
Eugen Rochko
fb6459d303 Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService,
slightly optimized FanOutOnWriteService again
2017-04-06 02:26:59 +02: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
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
Jantso Porali
d49612327a updated translation for about page 2017-04-05 14:47:42 +02:00
Jonathan Hurter
ffa888d59f Add node_modules and .cache to slugignore 2017-04-05 14:28:14 +02:00
Eugen Rochko
8f38353c4d Only render public payload once in FanOutOnWrite 2017-04-05 14:26:17 +02:00
wxcafé
37bd8d45ed Update List-of-Mastodon-instances.md 2017-04-05 14:21:45 +02:00
Angristan
0bd1bdfc44 Add git and curl as dependencies
In some VPS templates, they are not installed by default.
2017-04-05 14:11:08 +02:00
Jonathan Hurter
f3cc1e4416 Install nodejs before ruby 2017-04-05 13:53:30 +02:00
nicobz25
1e9b047d16 Merge branch 'master' into patch-1 2017-04-05 13:48:31 +02:00
Jonathan Hurter
05eba582ef Add scalingo support 2017-04-05 13:45:03 +02:00
Eugen Rochko
6687c4a114 Add index on mentions status_id 2017-04-05 13:32:57 +02:00
Eugen Rochko
3cc7378924 Replace ActionCable broadcast call with simple redis publish 2017-04-05 13:28:46 +02:00
Cédric Levieux
06d3e7dbba Typography on partY 2017-04-05 13:19:34 +02:00
nicobz25
6ea25d695a Update List-of-Mastodon-instances.md
Add our mastodon instance :) Thanks !
2017-04-05 13:13:09 +02:00
Eugen
7395c62367 Merge pull request #923 from jguerder/patch-1
Added mastodon.cx
2017-04-05 12:33:02 +02:00
Eugen
dd4cec6699 Merge pull request #925 from Angristan/patch-6
Add mstdn.io
2017-04-05 12:26:17 +02:00
Eugen
786dabefed Merge pull request #926 from farlistener/patch-2
Add mastodon.partipirate.org
2017-04-05 12:26:02 +02:00
Eugen
dde3a33e32 Merge pull request #922 from Angristan/patch-5
ECDH only
2017-04-05 12:18:57 +02:00
Cédric Levieux
9e06446d65 Add mastodon.partipirate.org 2017-04-05 11:24:21 +02:00
Angristan
17fb783672 Add mstdn.io 2017-04-05 11:16:56 +02:00
Jordan Guerder
3a98afd3e9 Added mastodon.cx 2017-04-05 10:52:56 +02:00
Angristan
53a01b38b2 ECDH only
Disable DHE ciphers. We don't loose any compatibility as we already use TLS 1.2, and ECDH is faster and safer.
Also, it's better so specify the curve.

This is the conf I use here : https://tls.imirhil.fr/https/mstdn.io
2017-04-05 10:44:08 +02:00
Eugen
10bd0e63d2 Merge pull request #909 from scriptjunkie/master
Add https://securitymastod.one/
2017-04-05 10:29:58 +02:00
Eugen
3975f92b8d Merge branch 'master' into master 2017-04-05 10:29:52 +02:00
Eugen
f8fd1e8a29 Merge pull request #901 from ashfurrow/patch-3
Adds mastodon.technology instance
2017-04-05 10:29:14 +02:00
Eugen
4d46908556 Merge pull request #911 from IMcD23/patch-1
Added mastodon.network instance.
2017-04-05 10:28:58 +02:00