Shel R
e659608797
Merge pull request #970 from estuans/patch-1
...
Update Production-guide.md
2017-04-07 21:49:57 -04:00
Shel R
ed332693fe
Merge branch 'master' into patch-1
2017-04-07 21:49:18 -04:00
Shel R
881e4277fd
Merge pull request #969 from Fortyseven/patch-1
...
Add social.bytestemplar.com to instances list
2017-04-07 21:48:58 -04:00
Shel R
5dfc9854f1
Merge branch 'master' into patch-1
2017-04-07 21:48:19 -04:00
Shel R
b300bb3b4e
Merge pull request #959 from mkody/patch-1
...
Added im-in.space
2017-04-07 21:45:06 -04:00
Shel R
6d519e6fd1
Merge branch 'master' into patch-1
2017-04-07 21:44:16 -04:00
Shel R
d2c9cc31de
Merge pull request #953 from Technowix/patch-1
...
Add niu.moe, cuz it's kawaii
2017-04-07 21:43:20 -04:00
Shel R
065defefac
Merge branch 'master' into patch-1
2017-04-07 21:42:10 -04:00
Shel R
6bfe068904
Merge pull request #944 from VirtuBox/patch-1
...
Update List-of-Mastodon-instances.md
2017-04-07 21:35:34 -04:00
Shel R
bc237d17a7
Merge branch 'master' into patch-1
2017-04-07 21:34:41 -04:00
Yann GUERN
485d75a805
#1141 on remote follow
...
The async action is send before persist, account.id not yet generated
Pull queue receive 'nil' so no profile update.
2017-04-08 03:24:35 +02:00
Eugen Rochko
4b621188ad
Fix #1165 - before_action was called before protect_from_forgery
2017-04-08 02:30:50 +02:00
David Huerta
4fb24a70d3
Merge branch 'master' into patch-1
2017-04-07 19:46:07 -04:00
Eugen Rochko
b2a7218ab7
Fix #801 - Respect webfinger's canonical response of username/domain
2017-04-08 01:07:42 +02:00
Eugen
a872f2f4c6
Merge pull request #1204 from benklop/patch-1
...
Update Administration-guide.md
2017-04-08 01:00:32 +02:00
Eugen
32a6f0884c
Merge pull request #1200 from huertanix/patch-2
...
Update Heroku-guide.md
2017-04-08 01:00:06 +02:00
Eugen
a54af44975
Merge pull request #1210 from raymestalez/patch-3
...
Add HackerNewsBot
2017-04-08 00:59:02 +02:00
Ray Alez
f113af5350
Add HackerNewsBot
...
I have created a bot that will post Hacker News stories with 100+ points. Adding it to the list.
2017-04-07 15:56:02 -07:00
benklop
f578cf8331
Update Administration-guide.md
...
the syntax for running the rake task wasn't correct.
2017-04-07 16:31:50 -06:00
Eugen
3cb13bdd84
Merge pull request #1125 from jasonrhodes/patch-1
...
Email service options :P
2017-04-08 00:24:38 +02:00
Eugen
0bf31f5436
Merge pull request #1147 from fmauNeko/docker_smaller_image
...
Fix npm/yarn cache cleaning
2017-04-07 23:45:48 +02:00
David Huerta
a7ab2204d4
Update Heroku-guide.md
...
Cleaning up the heroku admin command bit to match the form used in Administration-guide.md and clarify the wording a bit.
2017-04-07 17:44:32 -04:00
David Huerta
36a83cc4f9
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
30903d5f02
Add indigo.zone to list of instances
2017-04-07 14:10:37 -07:00
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
