Commit graph

2242 commits

Author SHA1 Message Date
Mouse Reeve
94536af96d 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
0b32b5108e Merge pull request #1191 from d3vgru/master
change suggested cipher for nginx
2017-04-07 23:02:49 +02:00
Florian Maunier
12f1cdeed1
Fix npm/yarn cache cleaning 2017-04-07 22:51:52 +02:00
Eugen
e2f024147c Merge pull request #1172 from mjankowski/mj-heroku-docs
Update heroku instructions
2017-04-07 22:50:31 +02:00
Eugen
1961825ff9 Merge pull request #1183 from thoughtbot/cp-post-status-service-specs
Add specs for PostStatusService
2017-04-07 22:30:28 +02:00
Eugen
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
Eugen
37a36b0bec Merge pull request #1192 from seekr/patch-2
typo
2017-04-07 22:25:48 +02:00
Eugen
c7d9b81d41 Merge pull request #1193 from thoughtbot/status-specs
Implement pending specs on Status
2017-04-07 22:25:10 +02:00
Joël Quenneville
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
seekr
131f505fd0 typo 2017-04-07 16:33:13 -03:00
Ed Knutson
27012aaeb6 change suggested cipher for nginx 2017-04-07 14:10:39 -05:00
Aguay-val
4c751d25e5 Add mastodon.fun 2017-04-07 20:33:52 +02:00
Chad Pytel
ad5ddd5e95 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
13c0077003 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
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
Chad Pytel
38bec79811 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
0f4fa59812 Update heroku instructions 2017-04-07 12:50:29 -04:00
foxiehkins
41396de7a9 Merge branch 'master' into master 2017-04-07 14:01:20 +01:00
Jason Rhodes
2ac8a590cd Moved into a comment per feedback 2017-04-07 07:43:44 -04:00
Eugen
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
Eugen
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
Eugen
c9b23a93c7 Merge branch 'master' into fix-object-type-nil-exception 2017-04-07 13:07:36 +02:00
Eugen
0adee18d73 Merge branch 'master' into feature-customized-default-locale 2017-04-07 13:07:03 +02:00
Eugen Rochko
8a6d8de60a Fix nil#object_type error 2017-04-07 13:05:34 +02:00
Jantso Porali
786e6f94b9 Update Finnish translations, add sample Minio config (#954) 2017-04-07 12:58:12 +02:00
Erwan Leboucher
0c4e9fdda0 Merge branch 'master' into patch-4 2017-04-07 12:43:56 +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
Sergei Č
8e7d0bda40 Update List-of-Mastodon-instances.md 2017-04-07 11:54:41 +03: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
Jason Rhodes
5d43a9cae2 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é
8a4ff30ceb updated instance hostname 2017-04-06 17:18:40 -07:00
Vladimir Mincev
56f4a94e7b 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
31597fd377 Low-hanging fruit of query optimization, these indices were missing 2017-04-07 00:04:38 +02:00
YDrogen
4b08b7c502 Added masto.razrnet.fr 2017-04-06 23:59:56 +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
Tristan Mahé
cfbd90cf44 Added pericles.world in the list of instances 2017-04-06 12:05:37 -07: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
isati
acf6436a99 Add manx.social instance 2017-04-06 19:31:25 +01:00
Erwan Leboucher
a0f1f9c664 Update List-of-Mastodon-instances.md 2017-04-06 20:18:56 +02:00
kadiix
f0d1107c53 Merge branch 'master' into patch-1 2017-04-06 19:33:36 +02:00
kadiix
02c1ad5347 Update List-of-Mastodon-instances.md 2017-04-06 19:33:17 +02:00
Eugen
fa494dbb1d Merge pull request #1038 from wade-r/optimize-dockerfile
Optimize Dockerfile
2017-04-06 19:32:50 +02:00
kadiix
a736b28646 Merge branch 'master' into patch-1 2017-04-06 19:32:31 +02:00