cat aescling's git repositories

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.

commit | commitdiff | tree

Chad Pytel [Fri, 7 Apr 2017 17:48:38 +0000 (13:48 -0400)]

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

commit | commitdiff | tree

Joël Quenneville [Fri, 7 Apr 2017 18:18:30 +0000 (14:18 -0400)]

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.

commit | commitdiff | tree

Chad Pytel [Fri, 7 Apr 2017 16:50:43 +0000 (12:50 -0400)]

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.

commit | commitdiff | tree

Matt Jankowski [Fri, 7 Apr 2017 15:34:10 +0000 (11:34 -0400)]

Update heroku instructions

commit | commitdiff | tree

foxiehkins [Fri, 7 Apr 2017 13:01:20 +0000 (14:01 +0100)]

Merge branch 'master' into master

commit | commitdiff | tree

Jason Rhodes [Fri, 7 Apr 2017 11:43:44 +0000 (07:43 -0400)]

Moved into a comment per feedback

commit | commitdiff | tree

Eugen [Fri, 7 Apr 2017 11:08:51 +0000 (13:08 +0200)]

Merge pull request #1146 from tootsuite/fix-object-type-nil-exception

Fix nil#object_type error

commit | commitdiff | tree

Eugen [Fri, 7 Apr 2017 11:08:27 +0000 (13:08 +0200)]

Merge pull request #1145 from tootsuite/feature-customized-default-locale

Allow setting of default language through config

commit | commitdiff | tree

Eugen [Fri, 7 Apr 2017 11:07:36 +0000 (13:07 +0200)]

Merge branch 'master' into fix-object-type-nil-exception

commit | commitdiff | tree

Eugen [Fri, 7 Apr 2017 11:07:03 +0000 (13:07 +0200)]

Merge branch 'master' into feature-customized-default-locale

commit | commitdiff | tree

Eugen Rochko [Fri, 7 Apr 2017 11:05:34 +0000 (13:05 +0200)]

Fix nil#object_type error

commit | commitdiff | tree

Jantso Porali [Fri, 7 Apr 2017 10:58:12 +0000 (12:58 +0200)]

Update Finnish translations, add sample Minio config (#954)

commit | commitdiff | tree

Erwan Leboucher [Fri, 7 Apr 2017 10:43:56 +0000 (12:43 +0200)]

Merge branch 'master' into patch-4

commit | commitdiff | tree

Eugen Rochko [Fri, 7 Apr 2017 10:40:26 +0000 (12:40 +0200)]

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

commit | commitdiff | tree

Eugen Rochko [Fri, 7 Apr 2017 10:21:00 +0000 (12:21 +0200)]

Re-add forgotten <author> element on standalone <entry>

commit | commitdiff | tree

Eugen [Fri, 7 Apr 2017 09:09:14 +0000 (11:09 +0200)]

Force UTF8 encoding on generated XML (#1140)

source code fur Kibicat Mastodon

RSS Atom