Eugen
0adee18d73
Merge branch 'master' into feature-customized-default-locale
2017-04-07 13:07:03 +02:00
Jantso Porali
786e6f94b9
Update Finnish translations, add sample Minio config ( #954 )
2017-04-07 12:58:12 +02:00
Eugen Rochko
e3a3422a65
Allow setting of default language through config
...
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-07 12:40:26 +02:00
Eugen Rochko
624a9a7136
Re-add forgotten <author> element on standalone <entry>
2017-04-07 12:21:00 +02:00
Eugen
1c351709bc
Force UTF8 encoding on generated XML ( #1140 )
2017-04-07 11:09:14 +02:00
Eugen
6d6a429af8
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
31597fd377
Low-hanging fruit of query optimization, these indices were missing
2017-04-07 00:04:38 +02:00
Eugen
8cb7d157bd
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
acf10a2c87
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
7596de1aec
Add a couple of network performance tweaks to Vagrantfile.
2017-04-06 22:34:59 +02:00
Matt Jankowski
97ae53daa8
Reduce size of background-photo.jpeg
...
Reduced by running through `guetzli` image optimizer.
2017-04-06 16:24:57 -04:00
Eugen
cd77c75d6c
Merge pull request #1088 from Wonderfall/master
...
Add metadata to Dockerfile
2017-04-06 21:35:10 +02:00
Wonderfall
ed2bfdee67
add Docker microbadger to README.md
2017-04-06 20:59:20 +02:00
Wonderfall
a3318814e1
add metadata to Dockerfile
2017-04-06 20:57:16 +02:00
Eugen
fa494dbb1d
Merge pull request #1038 from wade-r/optimize-dockerfile
...
Optimize Dockerfile
2017-04-06 19:32:50 +02:00
Eugen
c392c54271
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
5e63828917
Merge pull request #1048 from ashfurrow/slugignore
...
Updates slugignore
2017-04-06 19:09:45 +02:00
Eugen
ea86f4db15
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
a3d204e982
Linux users must enable NFS for Vagrant
2017-04-06 12:16:39 -04:00
Ash Furrow
a2adf84858
Updates slugignore.
2017-04-06 07:53:48 -04:00
Ryan Wade
a2637c1720
Optimize Dockerfile
...
Optimize Dockerfile, reduce build time.
2017-04-06 15:42:16 +08:00
Eugen Rochko
51d7caaf19
Fix wrong pubsub channel on public timelines
2017-04-06 04:03:23 +02:00
Eugen
a9c0062e80
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
dbd529109e
Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService,
...
slightly optimized FanOutOnWriteService again
2017-04-06 02:26:59 +02:00
blackle
540d6efe88
Catch more errors in process_follows so it doesn't fail
2017-04-05 20:04:13 -04:00
Eugen
dea6e47de0
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
5442083b3c
Split SalmonWorker into smaller parts, move profile updating into another job
2017-04-05 21:43:10 +02:00
James Moore
c19e0f1212
Use NFS for the shared folder because it dramatically decreases latency for git operations.
2017-04-05 11:53:39 -07:00
Eugen
bafbf63fcc
Merge pull request #958 from yiskah/patch-1
...
Correct innacurate info and other fixes
2017-04-05 20:48:19 +02:00
Eugen Rochko
d13d169922
Merge branch 'krainboltgreene-broadcast-to-worker'
2017-04-05 19:46:28 +02:00
Eugen Rochko
5b95be1c42
Replace calls to FeedManager#inline_render and #broadcast
2017-04-05 19:45:18 +02:00
Eugen Rochko
d755ce96da
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
29ffe1cad3
Make sure Rabl is using Oj
2017-04-05 19:29:30 +02:00
Eugen
c9ebd5d19f
Fix wrong variable used in publish channel
2017-04-05 18:58:32 +02:00
Eugen
1b8c244dff
Add proper message to PushUpdateWorker, use redis directly
2017-04-05 18:48:41 +02:00
Eugen
3d8b80e1cc
Merge branch 'master' into broadcast-to-worker
2017-04-05 18:44:33 +02:00
Jonathan Hurter
b8218ca482
Make scalingo doc clearer
2017-04-05 17:48:55 +02:00
Jonathan Hurter
4335dffe35
Fix wrong url in scalingo.json
2017-04-05 17:28:11 +02:00
shel
ee758551d1
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
b142a2ebf5
Merge pull request #947 from johnsudaar/feature/scalingo_one_click
...
Add Scalingo deployment support
2017-04-05 16:50:46 +02:00
Jonathan Hurter
d6bab0c71c
Add doc
2017-04-05 16:00:48 +02:00
Jonathan Hurter
5e7ec0fe57
Use root repository url
2017-04-05 15:52:06 +02:00
Jonathan Hurter
152a1e578c
Add Scalingo one click on readme
2017-04-05 15:33:19 +02:00
Eugen
a371a9e002
Merge pull request #940 from fahy/patch-1
...
Adding mastodon.irish
2017-04-05 15:24:52 +02:00
Eugen
be807ff7bd
Merge pull request #930 from nicobz25/patch-1
...
Update List-of-Mastodon-instances.md
2017-04-05 15:24:40 +02:00
Eugen
68e0421577
Merge pull request #939 from JantsoP/master
...
More translation updates
2017-04-05 15:24:24 +02:00
Padraig Fahy
cbcfd92a14
Adding mastodon.irish
2017-04-05 14:00:35 +01:00
Eugen
b45b4865a7
Merge pull request #938 from wxcafe/patch-3
...
Updates description for `social.wxcafe.net`
2017-04-05 14:57:38 +02:00
Eugen
188172c401
Merge pull request #931 from farlistener/patch-3
...
Typography on partY
2017-04-05 14:57:14 +02:00
Eugen
7c4dde56a3
Merge pull request #936 from Angristan/patch-7
...
Add git and curl as dependencies
2017-04-05 14:57:01 +02:00
