32748c0f71
Merge pull request #1184 from thoughtbot/extract-proper-status
...
DRY up reblog vs original status check
2017-04-07 22:28:15 +02:00
37a36b0bec
Merge pull request #1192 from seekr/patch-2
...
typo
2017-04-07 22:25:48 +02:00
c7d9b81d41
Merge pull request #1193 from thoughtbot/status-specs
...
Implement pending specs on Status
2017-04-07 22:25:10 +02:00
4fdeac21f4
Implement pending specs on Status
...
Implement the two pending specs on `Status`: `reblogs_count` and
`favourites_count`.
2017-04-07 15:36:06 -04:00
131f505fd0
typo
2017-04-07 16:33:13 -03:00
d4c94fa004
DRY up reblog vs original status check
...
Checking reblog vs original status was happening in multiple places
across the app. For views, this logic was encapsulated in a helper
method named `proper_status` but in the other layers of the app, the
logic was duplicated.
Because the logic is used at all layers of the app, we extracted it into
a `Status#proper` method on the model and changed all uses of the logic
to use this method. There is now a single source of truth for this
condition.
We added test coverage to untested methods that got refactored.
2017-04-07 14:18:30 -04:00
4e41cd9ab8
Merge pull request #1146 from tootsuite/fix-object-type-nil-exception
...
Fix nil#object_type error
2017-04-07 13:08:51 +02:00
10459241a8
Merge pull request #1145 from tootsuite/feature-customized-default-locale
...
Allow setting of default language through config
2017-04-07 13:08:27 +02:00
c9b23a93c7
Merge branch 'master' into fix-object-type-nil-exception
2017-04-07 13:07:36 +02:00
0adee18d73
Merge branch 'master' into feature-customized-default-locale
2017-04-07 13:07:03 +02:00
8a6d8de60a
Fix nil#object_type error
2017-04-07 13:05:34 +02:00
786e6f94b9
Update Finnish translations, add sample Minio config ( #954 )
2017-04-07 12:58:12 +02:00
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
624a9a7136
Re-add forgotten <author> element on standalone <entry>
2017-04-07 12:21:00 +02:00
1c351709bc
Force UTF8 encoding on generated XML ( #1140 )
2017-04-07 11:09:14 +02:00
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
31597fd377
Low-hanging fruit of query optimization, these indices were missing
2017-04-07 00:04:38 +02:00
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
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
7596de1aec
Add a couple of network performance tweaks to Vagrantfile.
2017-04-06 22:34:59 +02:00
97ae53daa8
Reduce size of background-photo.jpeg
...
Reduced by running through `guetzli` image optimizer.
2017-04-06 16:24:57 -04:00
cd77c75d6c
Merge pull request #1088 from Wonderfall/master
...
Add metadata to Dockerfile
2017-04-06 21:35:10 +02:00
ed2bfdee67
add Docker microbadger to README.md
2017-04-06 20:59:20 +02:00
a3318814e1
add metadata to Dockerfile
2017-04-06 20:57:16 +02:00
fa494dbb1d
Merge pull request #1038 from wade-r/optimize-dockerfile
...
Optimize Dockerfile
2017-04-06 19:32:50 +02:00
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
5e63828917
Merge pull request #1048 from ashfurrow/slugignore
...
Updates slugignore
2017-04-06 19:09:45 +02:00
ea86f4db15
Merge pull request #1070 from alexgleason/patch-4
...
Linux users must enable NFS for Vagrant
2017-04-06 19:02:14 +02:00
a3d204e982
Linux users must enable NFS for Vagrant
2017-04-06 12:16:39 -04:00
a2adf84858
Updates slugignore.
2017-04-06 07:53:48 -04:00
a2637c1720
Optimize Dockerfile
...
Optimize Dockerfile, reduce build time.
2017-04-06 15:42:16 +08:00
51d7caaf19
Fix wrong pubsub channel on public timelines
2017-04-06 04:03:23 +02:00
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
dbd529109e
Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService,
...
slightly optimized FanOutOnWriteService again
2017-04-06 02:26:59 +02:00
540d6efe88
Catch more errors in process_follows so it doesn't fail
2017-04-05 20:04:13 -04:00
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
5442083b3c
Split SalmonWorker into smaller parts, move profile updating into another job
2017-04-05 21:43:10 +02:00
c19e0f1212
Use NFS for the shared folder because it dramatically decreases latency for git operations.
2017-04-05 11:53:39 -07:00
bafbf63fcc
Merge pull request #958 from yiskah/patch-1
...
Correct innacurate info and other fixes
2017-04-05 20:48:19 +02:00
d13d169922
Merge branch 'krainboltgreene-broadcast-to-worker'
2017-04-05 19:46:28 +02:00
5b95be1c42
Replace calls to FeedManager#inline_render and #broadcast
2017-04-05 19:45:18 +02:00
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
29ffe1cad3
Make sure Rabl is using Oj
2017-04-05 19:29:30 +02:00
c9ebd5d19f
Fix wrong variable used in publish channel
2017-04-05 18:58:32 +02:00
1b8c244dff
Add proper message to PushUpdateWorker, use redis directly
2017-04-05 18:48:41 +02:00
3d8b80e1cc
Merge branch 'master' into broadcast-to-worker
2017-04-05 18:44:33 +02:00
b8218ca482
Make scalingo doc clearer
2017-04-05 17:48:55 +02:00
4335dffe35
Fix wrong url in scalingo.json
2017-04-05 17:28:11 +02:00
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
b142a2ebf5
Merge pull request #947 from johnsudaar/feature/scalingo_one_click
...
Add Scalingo deployment support
2017-04-05 16:50:46 +02:00
