]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoFix wrong pubsub channel on public timelines
Eugen Rochko [Thu, 6 Apr 2017 02:03:23 +0000 (04:03 +0200)]
Fix wrong pubsub channel on public timelines

8 years agoMerge pull request #1013 from blackle/master
Eugen [Thu, 6 Apr 2017 00:35:34 +0000 (02:35 +0200)]
Merge pull request #1013 from blackle/master

Catch more errors in process_follows so it doesn't fail

8 years agoFix notifications delivered to wrong pubsub channel, optimized RemoveStatusService,
Eugen Rochko [Thu, 6 Apr 2017 00:26:59 +0000 (02:26 +0200)]
Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService,
slightly optimized FanOutOnWriteService again

8 years agoCatch more errors in process_follows so it doesn't fail
blackle [Thu, 6 Apr 2017 00:04:13 +0000 (20:04 -0400)]
Catch more errors in process_follows so it doesn't fail

8 years agoMerge pull request #993 from foozmeat/patch-1
Eugen [Wed, 5 Apr 2017 21:26:44 +0000 (23:26 +0200)]
Merge pull request #993 from foozmeat/patch-1

Use NFS for the shared folder because it dramatically decreases latency for git operations.

8 years agoSplit SalmonWorker into smaller parts, move profile updating into another job
Eugen Rochko [Wed, 5 Apr 2017 19:41:50 +0000 (21:41 +0200)]
Split SalmonWorker into smaller parts, move profile updating into another job

8 years agoUse NFS for the shared folder because it dramatically decreases latency for git opera...
James Moore [Wed, 5 Apr 2017 18:53:39 +0000 (11:53 -0700)]
Use NFS for the shared folder because it dramatically decreases latency for git operations.

8 years agoMerge pull request #958 from yiskah/patch-1
Eugen [Wed, 5 Apr 2017 18:48:19 +0000 (20:48 +0200)]
Merge pull request #958 from yiskah/patch-1

Correct innacurate info and other fixes

8 years agoMerge branch 'krainboltgreene-broadcast-to-worker'
Eugen Rochko [Wed, 5 Apr 2017 17:46:28 +0000 (19:46 +0200)]
Merge branch 'krainboltgreene-broadcast-to-worker'

8 years agoReplace calls to FeedManager#inline_render and #broadcast
Eugen Rochko [Wed, 5 Apr 2017 17:45:18 +0000 (19:45 +0200)]
Replace calls to FeedManager#inline_render and #broadcast

8 years agoMerge branch 'broadcast-to-worker' of https://github.com/krainboltgreene/mastodon...
Eugen Rochko [Wed, 5 Apr 2017 17:29:46 +0000 (19:29 +0200)]
Merge branch 'broadcast-to-worker' of https://github.com/krainboltgreene/mastodon into krainboltgreene-broadcast-to-worker

8 years agoMake sure Rabl is using Oj
Eugen Rochko [Wed, 5 Apr 2017 16:51:15 +0000 (18:51 +0200)]
Make sure Rabl is using Oj

8 years agoFix wrong variable used in publish channel
Eugen [Wed, 5 Apr 2017 16:58:32 +0000 (18:58 +0200)]
Fix wrong variable used in publish channel

8 years agoAdd proper message to PushUpdateWorker, use redis directly
Eugen [Wed, 5 Apr 2017 16:48:41 +0000 (18:48 +0200)]
Add proper message to PushUpdateWorker, use redis directly

8 years agoMerge branch 'master' into broadcast-to-worker
Eugen [Wed, 5 Apr 2017 16:44:33 +0000 (18:44 +0200)]
Merge branch 'master' into broadcast-to-worker

8 years agoCorrect innacurate info and other fixes
shel [Wed, 5 Apr 2017 14:58:41 +0000 (10:58 -0400)]
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.

8 years agoMerge pull request #947 from johnsudaar/feature/scalingo_one_click
Eugen [Wed, 5 Apr 2017 14:50:46 +0000 (16:50 +0200)]
Merge pull request #947 from johnsudaar/feature/scalingo_one_click

Add Scalingo deployment support

8 years agoAdd doc
Jonathan Hurter [Wed, 5 Apr 2017 14:00:48 +0000 (16:00 +0200)]
Add doc

8 years agoUse root repository url
Jonathan Hurter [Wed, 5 Apr 2017 13:52:06 +0000 (15:52 +0200)]
Use root repository url

8 years agoAdd Scalingo one click on readme
Jonathan Hurter [Wed, 5 Apr 2017 13:26:36 +0000 (15:26 +0200)]
Add Scalingo one click on readme

8 years agoMerge pull request #940 from fahy/patch-1
Eugen [Wed, 5 Apr 2017 13:24:52 +0000 (15:24 +0200)]
Merge pull request #940 from fahy/patch-1

Adding mastodon.irish

8 years agoMerge pull request #930 from nicobz25/patch-1
Eugen [Wed, 5 Apr 2017 13:24:40 +0000 (15:24 +0200)]
Merge pull request #930 from nicobz25/patch-1

Update List-of-Mastodon-instances.md

8 years agoMerge pull request #939 from JantsoP/master
Eugen [Wed, 5 Apr 2017 13:24:24 +0000 (15:24 +0200)]
Merge pull request #939 from JantsoP/master

More translation updates

8 years agoAdding mastodon.irish
Padraig Fahy [Wed, 5 Apr 2017 13:00:35 +0000 (14:00 +0100)]
Adding mastodon.irish

8 years agoMerge pull request #938 from wxcafe/patch-3
Eugen [Wed, 5 Apr 2017 12:57:38 +0000 (14:57 +0200)]
Merge pull request #938 from wxcafe/patch-3

Updates description for `social.wxcafe.net`

8 years agoMerge pull request #931 from farlistener/patch-3
Eugen [Wed, 5 Apr 2017 12:57:14 +0000 (14:57 +0200)]
Merge pull request #931 from farlistener/patch-3

Typography on partY

8 years agoMerge pull request #936 from Angristan/patch-7
Eugen [Wed, 5 Apr 2017 12:57:01 +0000 (14:57 +0200)]
Merge pull request #936 from Angristan/patch-7

Add git and curl as dependencies

8 years agoupdated blocking translation
Jantso Porali [Wed, 5 Apr 2017 12:53:35 +0000 (14:53 +0200)]
updated blocking translation

8 years agoupdated two-way auth and preferences translation
Jantso Porali [Wed, 5 Apr 2017 12:49:29 +0000 (14:49 +0200)]
updated two-way auth and preferences translation

8 years agoupdated translation for about page
Jantso Porali [Wed, 5 Apr 2017 12:47:42 +0000 (14:47 +0200)]
updated translation for about page

8 years agoAdd node_modules and .cache to slugignore
Jonathan Hurter [Wed, 5 Apr 2017 12:13:34 +0000 (14:13 +0200)]
Add node_modules and .cache to slugignore

8 years agoOnly render public payload once in FanOutOnWrite
Eugen Rochko [Wed, 5 Apr 2017 12:26:17 +0000 (14:26 +0200)]
Only render public payload once in FanOutOnWrite

8 years agoUpdate List-of-Mastodon-instances.md
wxcafé [Wed, 5 Apr 2017 12:21:45 +0000 (14:21 +0200)]
Update List-of-Mastodon-instances.md

8 years agoAdd git and curl as dependencies
Angristan [Wed, 5 Apr 2017 12:11:08 +0000 (14:11 +0200)]
Add git and curl as dependencies

In some VPS templates, they are not installed by default.

8 years agoInstall nodejs before ruby
Jonathan Hurter [Wed, 5 Apr 2017 11:53:30 +0000 (13:53 +0200)]
Install nodejs before ruby

8 years agoMerge branch 'master' into patch-1
nicobz25 [Wed, 5 Apr 2017 11:48:31 +0000 (13:48 +0200)]
Merge branch 'master' into patch-1

8 years agoAdd scalingo support
Jonathan Hurter [Wed, 5 Apr 2017 11:45:03 +0000 (13:45 +0200)]
Add scalingo support

8 years agoAdd index on mentions status_id
Eugen Rochko [Wed, 5 Apr 2017 11:32:57 +0000 (13:32 +0200)]
Add index on mentions status_id

8 years agoReplace ActionCable broadcast call with simple redis publish
Eugen Rochko [Wed, 5 Apr 2017 11:28:46 +0000 (13:28 +0200)]
Replace ActionCable broadcast call with simple redis publish

8 years agoTypography on partY
Cédric Levieux [Wed, 5 Apr 2017 11:19:34 +0000 (13:19 +0200)]
Typography on partY

8 years agoUpdate List-of-Mastodon-instances.md
nicobz25 [Wed, 5 Apr 2017 11:13:09 +0000 (13:13 +0200)]
Update List-of-Mastodon-instances.md

Add our mastodon instance :) Thanks !

8 years agoMerge pull request #923 from jguerder/patch-1
Eugen [Wed, 5 Apr 2017 10:33:02 +0000 (12:33 +0200)]
Merge pull request #923 from jguerder/patch-1

Added mastodon.cx

8 years agoMerge pull request #925 from Angristan/patch-6
Eugen [Wed, 5 Apr 2017 10:26:17 +0000 (12:26 +0200)]
Merge pull request #925 from Angristan/patch-6

Add mstdn.io

8 years agoMerge pull request #926 from farlistener/patch-2
Eugen [Wed, 5 Apr 2017 10:26:02 +0000 (12:26 +0200)]
Merge pull request #926 from farlistener/patch-2

Add mastodon.partipirate.org

8 years agoMerge pull request #922 from Angristan/patch-5
Eugen [Wed, 5 Apr 2017 10:18:57 +0000 (12:18 +0200)]
Merge pull request #922 from Angristan/patch-5

ECDH only

8 years agoAdd mastodon.partipirate.org
Cédric Levieux [Wed, 5 Apr 2017 09:24:21 +0000 (11:24 +0200)]
Add mastodon.partipirate.org

8 years agoAdd mstdn.io
Angristan [Wed, 5 Apr 2017 09:16:56 +0000 (11:16 +0200)]
Add mstdn.io

8 years agoAdded mastodon.cx
Jordan Guerder [Wed, 5 Apr 2017 08:52:56 +0000 (10:52 +0200)]
Added mastodon.cx

8 years agoECDH only
Angristan [Wed, 5 Apr 2017 08:44:08 +0000 (10:44 +0200)]
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

8 years agoMerge pull request #909 from scriptjunkie/master
Eugen [Wed, 5 Apr 2017 08:29:58 +0000 (10:29 +0200)]
Merge pull request #909 from scriptjunkie/master

Add https://securitymastod.one/

8 years agoMerge branch 'master' into master
Eugen [Wed, 5 Apr 2017 08:29:52 +0000 (10:29 +0200)]
Merge branch 'master' into master

8 years agoMerge pull request #901 from ashfurrow/patch-3
Eugen [Wed, 5 Apr 2017 08:29:14 +0000 (10:29 +0200)]
Merge pull request #901 from ashfurrow/patch-3

Adds mastodon.technology instance

8 years agoMerge pull request #911 from IMcD23/patch-1
Eugen [Wed, 5 Apr 2017 08:28:58 +0000 (10:28 +0200)]
Merge pull request #911 from IMcD23/patch-1

Added mastodon.network instance.

8 years agoMerge pull request #919 from JantsoP/master
Eugen [Wed, 5 Apr 2017 08:27:12 +0000 (10:27 +0200)]
Merge pull request #919 from JantsoP/master

More updates to Finnish language

8 years agoMerge pull request #902 from asm/ssl_best_practices
Eugen [Wed, 5 Apr 2017 08:26:32 +0000 (10:26 +0200)]
Merge pull request #902 from asm/ssl_best_practices

SSL best practices for nginx

8 years agoFix API method URL typo
Eugen [Wed, 5 Apr 2017 08:25:05 +0000 (10:25 +0200)]
Fix API method URL typo

8 years agoMerge pull request #903 from yiskah/patch-6
Eugen [Wed, 5 Apr 2017 08:24:25 +0000 (10:24 +0200)]
Merge pull request #903 from yiskah/patch-6

Corrected misinformation regarding Direct Posts

8 years agoMerge pull request #908 from krainboltgreene/application-worker-for-shared-logic
Eugen [Wed, 5 Apr 2017 08:23:52 +0000 (10:23 +0200)]
Merge pull request #908 from krainboltgreene/application-worker-for-shared-logic

ApplicationWorker for shared worker behavior

8 years agoMerge pull request #910 from krainboltgreene/master
Eugen [Wed, 5 Apr 2017 08:23:32 +0000 (10:23 +0200)]
Merge pull request #910 from krainboltgreene/master

Mastodon isn't using jbuilder or sdoc, and it prevents an upgrade to 2.4.0

8 years agoMerge pull request #914 from bradurani/bu/query_cleanup
Eugen [Wed, 5 Apr 2017 08:23:10 +0000 (10:23 +0200)]
Merge pull request #914 from bradurani/bu/query_cleanup

Eliminate unnecessary queries and query clauses with none and all

8 years agoMerge branch 'master' into master
JantsoP [Wed, 5 Apr 2017 08:07:17 +0000 (10:07 +0200)]
Merge branch 'master' into master

8 years agoupdated reblog to boost translation
JantsoP [Wed, 5 Apr 2017 07:57:25 +0000 (09:57 +0200)]
updated reblog to boost translation

Since it is that :D

8 years agoupdated translation
JantsoP [Wed, 5 Apr 2017 07:56:10 +0000 (09:56 +0200)]
updated translation

Updated some translations after seeing them in service. Should be better now

8 years agoudpdated display_name translation
JantsoP [Wed, 5 Apr 2017 07:52:31 +0000 (09:52 +0200)]
udpdated display_name translation

8 years agoupdated reblog translation
JantsoP [Wed, 5 Apr 2017 07:51:35 +0000 (09:51 +0200)]
updated reblog translation

8 years agoEliminate unnecessary queries and query clauses with none and all
Brad Urani [Wed, 5 Apr 2017 06:02:58 +0000 (06:02 +0000)]
Eliminate unnecessary queries and query clauses with none and all

8 years agoUpdate List-of-Mastodon-instances.md
Ian McDowell [Wed, 5 Apr 2017 04:43:57 +0000 (23:43 -0500)]
Update List-of-Mastodon-instances.md

Added mastodon.network.

8 years agoMastodon isn't using jbuilder or sdoc, and it prevents an upgrade to 2.4.0
Kurtis Rainbolt-Greene [Wed, 5 Apr 2017 04:31:02 +0000 (21:31 -0700)]
Mastodon isn't using jbuilder or sdoc, and it prevents an upgrade to 2.4.0

8 years agoAdd https://securitymastod.one/
scriptjunkie [Wed, 5 Apr 2017 04:21:00 +0000 (23:21 -0500)]
Add https://securitymastod.one/

8 years agoWe're going to want these nice helper methods, lets share them with a parent class...
Kurtis Rainbolt-Greene [Wed, 5 Apr 2017 04:14:37 +0000 (21:14 -0700)]
We're going to want these nice helper methods, lets share them with a parent class that matches Rails 5 practices (application level abstraction)

8 years agoMoved to the worker
Kurtis Rainbolt-Greene [Wed, 5 Apr 2017 03:51:44 +0000 (20:51 -0700)]
Moved to the worker

8 years agoMoving in the inline render
Kurtis Rainbolt-Greene [Wed, 5 Apr 2017 03:51:18 +0000 (20:51 -0700)]
Moving in the inline render

8 years agoI don't actually think we need that.
Kurtis Rainbolt-Greene [Wed, 5 Apr 2017 03:48:22 +0000 (20:48 -0700)]
I don't actually think we need that.

8 years agoMoving the queue_at into the worker
Kurtis Rainbolt-Greene [Wed, 5 Apr 2017 03:39:14 +0000 (20:39 -0700)]
Moving the queue_at into the worker

8 years agoThis method isn't used anymore
Kurtis Rainbolt-Greene [Wed, 5 Apr 2017 03:38:07 +0000 (20:38 -0700)]
This method isn't used anymore

8 years agoReplacing the broadcast method with the one defined in the feed manager
Kurtis Rainbolt-Greene [Wed, 5 Apr 2017 03:36:03 +0000 (20:36 -0700)]
Replacing the broadcast method with the one defined in the feed manager

8 years agoBy pushing this into a worker we can reduce the amount of time the feed manager using...
Kurtis Rainbolt-Greene [Wed, 5 Apr 2017 03:16:53 +0000 (20:16 -0700)]
By pushing this into a worker we can reduce the amount of time the feed manager using workers eat up a connection

8 years agoCorrected misinformation regarding Direct Posts
shel [Wed, 5 Apr 2017 01:47:13 +0000 (21:47 -0400)]
Corrected misinformation regarding Direct Posts

Unless something changed recently I have no clue why this said that direct posts do not federate because they do.

8 years agoSSL best practices for nginx
Jason Snell [Wed, 5 Apr 2017 01:43:21 +0000 (18:43 -0700)]
SSL best practices for nginx

8 years agoAdds mastodon.technology
Ash Furrow [Wed, 5 Apr 2017 01:35:45 +0000 (21:35 -0400)]
Adds mastodon.technology

8 years agoMerge branch 'fakenine-add_more_tests_to_models'
Eugen Rochko [Wed, 5 Apr 2017 01:31:45 +0000 (03:31 +0200)]
Merge branch 'fakenine-add_more_tests_to_models'

8 years agoFix spec
Eugen Rochko [Wed, 5 Apr 2017 01:31:26 +0000 (03:31 +0200)]
Fix spec

8 years agoMerge branch 'master' into add_more_tests_to_models
Eugen [Wed, 5 Apr 2017 01:27:38 +0000 (03:27 +0200)]
Merge branch 'master' into add_more_tests_to_models

8 years agoMerge pull request #885 from optikfluffel/patch-1
Eugen [Wed, 5 Apr 2017 01:24:08 +0000 (03:24 +0200)]
Merge pull request #885 from optikfluffel/patch-1

Update Production-guide.md

8 years agoMerge pull request #839 from SirCmpwn/profile-readability
Eugen [Wed, 5 Apr 2017 01:23:16 +0000 (03:23 +0200)]
Merge pull request #839 from SirCmpwn/profile-readability

Improve readability of text on profiles

8 years agoMerge pull request #860 from pierreozoux/patch-1
Eugen [Wed, 5 Apr 2017 01:20:51 +0000 (03:20 +0200)]
Merge pull request #860 from pierreozoux/patch-1

Update the list of instances

8 years agoMerge branch 'master' into patch-1
Eugen [Wed, 5 Apr 2017 01:20:37 +0000 (03:20 +0200)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #859 from dereckson/patch-1
Eugen [Wed, 5 Apr 2017 01:20:01 +0000 (03:20 +0200)]
Merge pull request #859 from dereckson/patch-1

Add social.nasqueron.org instance

8 years agoMerge branch 'master' into patch-1
Eugen [Wed, 5 Apr 2017 01:19:14 +0000 (03:19 +0200)]
Merge branch 'master' into patch-1

8 years agoMerge pull request #843 from fmauNeko/patch-1
Eugen [Wed, 5 Apr 2017 01:18:48 +0000 (03:18 +0200)]
Merge pull request #843 from fmauNeko/patch-1

Update List-of-Mastodon-instances.md

8 years agoMerge branch 'master' into patch-1
Eugen [Wed, 5 Apr 2017 01:18:42 +0000 (03:18 +0200)]
Merge branch 'master' into patch-1

8 years agoImprove readability of text on profiles
Drew DeVault [Tue, 4 Apr 2017 13:26:21 +0000 (09:26 -0400)]
Improve readability of text on profiles

8 years agoMerge pull request #863 from Eychics/master
Eugen [Wed, 5 Apr 2017 01:11:13 +0000 (03:11 +0200)]
Merge pull request #863 from Eychics/master

Add closed_registrations message on French language

8 years agoMerge pull request #818 from JantsoP/master
Eugen [Wed, 5 Apr 2017 01:09:20 +0000 (03:09 +0200)]
Merge pull request #818 from JantsoP/master

Updated Finnish Translation

8 years agoMerge pull request #846 from TrollDecker/master
Eugen [Wed, 5 Apr 2017 01:08:59 +0000 (03:08 +0200)]
Merge pull request #846 from TrollDecker/master

Update social.diskseven.com's IPv6 status

8 years agoMerge pull request #842 from Angristan/patch-2
Eugen [Wed, 5 Apr 2017 01:08:24 +0000 (03:08 +0200)]
Merge pull request #842 from Angristan/patch-2

Missing quotes

8 years agoMerge pull request #845 from thurloat/patch-1
Eugen [Wed, 5 Apr 2017 01:07:59 +0000 (03:07 +0200)]
Merge pull request #845 from thurloat/patch-1

Add mastodon.club to running instances list

8 years agoMerge pull request #848 from ProgVal/patch-3
Eugen [Wed, 5 Apr 2017 01:07:46 +0000 (03:07 +0200)]
Merge pull request #848 from ProgVal/patch-3

Add oc.todon.fr to the list of instances.

8 years agoMerge pull request #854 from Angristan/patch-3
Eugen [Wed, 5 Apr 2017 01:07:28 +0000 (03:07 +0200)]
Merge pull request #854 from Angristan/patch-3

Fix crontab edit

8 years agoMerge pull request #866 from kklleemm/patch-1
Eugen [Wed, 5 Apr 2017 01:06:41 +0000 (03:06 +0200)]
Merge pull request #866 from kklleemm/patch-1

Fix typos on french translations