Commit graph

2044 commits

Author SHA1 Message Date
David Huerta
fbfb94ca00 Update Heroku-guide.md
Removing some of the confusion around what format S3 bucket names and regions should be entered as well as providing an example of an S3 policy that follows best security practices for this sort of thing.
2017-04-07 17:29:21 -04:00
Blake
7ede8d0b5a Add indigo.zone to list of instances 2017-04-07 14:10:37 -07:00
Mouse Reeve
be2e5c4f53 Adds Oulipo.social to Mastodons list
This is a Mastodon with a particular constraint about
what symbols you can post.
2017-04-07 14:06:49 -07:00
Eugen
f74fb89cbd Merge pull request #1191 from d3vgru/master
change suggested cipher for nginx
2017-04-07 23:02:49 +02:00
Florian Maunier
97ff85dc73 Fix npm/yarn cache cleaning 2017-04-07 22:51:52 +02:00
Eugen
895201fd9d Merge pull request #1172 from mjankowski/mj-heroku-docs
Update heroku instructions
2017-04-07 22:50:31 +02:00
Eugen
c3f2975fa4 Merge pull request #1183 from thoughtbot/cp-post-status-service-specs
Add specs for PostStatusService
2017-04-07 22:30:28 +02:00
Eugen
29a092d6c4 Merge pull request #1184 from thoughtbot/extract-proper-status
DRY up reblog vs original status check
2017-04-07 22:28:15 +02:00
Eugen
3a448fde82 Merge pull request #1192 from seekr/patch-2
typo
2017-04-07 22:25:48 +02:00
Eugen
4708ee7127 Merge pull request #1193 from thoughtbot/status-specs
Implement pending specs on Status
2017-04-07 22:25:10 +02:00
Joël Quenneville
9fda277193 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
seekr
231db3cdc1 typo 2017-04-07 16:33:13 -03:00
Ed Knutson
26b92ae438 change suggested cipher for nginx 2017-04-07 14:10:39 -05:00
Aguay-val
14bd321fca Add mastodon.fun 2017-04-07 20:33:52 +02: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
Erwan Leboucher
07d1559425 Merge branch 'master' into patch-4 2017-04-07 12:43:56 +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
Sergei Č
44ded06f3b Update List-of-Mastodon-instances.md 2017-04-07 11:54:41 +03: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
Tristan Mahé
a80680cf3f updated instance hostname 2017-04-06 17:18:40 -07:00
Vladimir Mincev
bfe3d5a719 Update Production-guide.md
Under ## General dependencies:
apt-get needs sudo and install was typed wrongly.
2017-04-07 01:05:32 +02:00
Eugen Rochko
b184c13102 Low-hanging fruit of query optimization, these indices were missing 2017-04-07 00:04:38 +02:00
YDrogen
cee4b3a359 Added masto.razrnet.fr 2017-04-06 23:59:56 +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
Tristan Mahé
fe26dd71ad Added pericles.world in the list of instances 2017-04-06 12:05:37 -07: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
isati
7b92127188 Add manx.social instance 2017-04-06 19:31:25 +01:00
Erwan Leboucher
a1e37a05f9 Update List-of-Mastodon-instances.md 2017-04-06 20:18:56 +02:00
kadiix
7006cbe5e1 Merge branch 'master' into patch-1 2017-04-06 19:33:36 +02:00
kadiix
81bb50a15b Update List-of-Mastodon-instances.md 2017-04-06 19:33:17 +02:00