Commit Graph

1906 Commits (3b9a56d4b32dfcd4858636b4b817a0874cbdec8d)

Author SHA1 Message Date
Ed Knutson 26b92ae438 change suggested cipher for nginx 2017-04-07 14:10:39 -05:00
Chad Pytel 1a82d2bde6 Use I18n for media attachment validation errors
These are currently user facing errors, but are not localized. This adds the
ability for these messages to be localized.
2017-04-07 14:23:18 -04:00
Chad Pytel 6a69f9ac65 Add specs for PostStatusService
This implements all pending specs, and adds additional coverage for the
following functionality:

* Normal status creation
* Creating a reply status
* Creating a sensitive status
* Creating a status with spoiler text
* A status with no spoiler text gets an empty string for spoiler text
* Creating a status with custom visibility
* Creating a status for an application
* Processing mentions
* Processing Hashtags
* Pinging PuSH hubs
* Crawling links
* Attaching media
2017-04-07 14:21:16 -04:00
Joël Quenneville 8a67fb5eca 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
Chad Pytel 31f01ad592 Add specs for media attachment validations
There are currently not specs for the two media validations that are performed
by `PostStatusService`. This adds specs for the validations that ensure that you
cannot attach more than four files, and that a status cannot have both image and
video attachments.
2017-04-07 12:50:43 -04:00
Matt Jankowski 5a85b7f4fe Update heroku instructions 2017-04-07 12:50:29 -04:00
foxiehkins f5a5571f64 Merge branch 'master' into master 2017-04-07 14:01:20 +01:00
Jason Rhodes 41e986eede Moved into a comment per feedback 2017-04-07 07:43:44 -04:00
Eugen 2f1bd3462e Merge pull request #1146 from tootsuite/fix-object-type-nil-exception
Fix nil#object_type error
2017-04-07 13:08:51 +02:00
Eugen b686d76a15 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
Eugen 7215446774 Merge branch 'master' into fix-object-type-nil-exception 2017-04-07 13:07:36 +02:00
Eugen ef7240169a Merge branch 'master' into feature-customized-default-locale 2017-04-07 13:07:03 +02:00
Eugen Rochko eaa0b8e669 Fix nil#object_type error 2017-04-07 13:05:34 +02:00
Jantso Porali fb0ce9d38d Update Finnish translations, add sample Minio config (#954) 2017-04-07 12:58:12 +02:00
Eugen Rochko 9bb84337a7 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 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
Jason Rhodes af34bcad02 Email service options :P
Small addition in case people want email service options, sparkpost.com gives you 100k/mo free
2017-04-06 22:48:17 -04: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
VirtuBox 4564e512e7 Merge branch 'master' into patch-1 2017-04-06 19:11:39 +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
Ninetailed e2dd644eae Description in instance list for mastodon.ninetailed.uk 2017-04-05 22:35:35 +01: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
Thibaut (Eychics) e0908be254 Add mastodon.nuzgo.net 2017-04-05 20:45:23 +02:00
ava d7f33066b7 Update List-of-Mastodon-instances.md 2017-04-05 21:44:13 +03:00
André Lewin 783de713cd Merge branch 'master' into master 2017-04-05 20:28:58 +02:00
Brad Janke 9999d134dd Adds mtndevelopment 2017-04-05 13:14:27 -05: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