akkoma
5 years agoDo not include notifications from blocked users when with_muted is set
rinpatch [Mon, 21 Oct 2019 09:38:35 +0000 (12:38 +0300)]
Do not include notifications from blocked users when with_muted is set

This is not what with_muted is for per documentation and it was agreed
on irc that this behavior doesn't make sense.

5 years agopleroma_ctl: fix crashes due to different shift(1) behavior on dash
rinpatch [Thu, 24 Oct 2019 20:28:59 +0000 (23:28 +0300)]
pleroma_ctl: fix crashes due to different shift(1) behavior on dash

5 years agoMerge branch 'release/1.1.2' into 'stable'
rinpatch [Fri, 18 Oct 2019 21:44:14 +0000 (21:44 +0000)]
Merge branch 'release/1.1.2' into 'stable'

1.1.2 Release

See merge request pleroma/pleroma!1863

5 years agopleroma_ctl: Fix attempting to use RPC for config generation
rinpatch [Fri, 18 Oct 2019 21:37:39 +0000 (00:37 +0300)]
pleroma_ctl: Fix attempting to use RPC for config generation

5 years agoBump version to 1.1.2 in mix.exs
rinpatch [Fri, 18 Oct 2019 21:40:23 +0000 (00:40 +0300)]
Bump version to 1.1.2 in mix.exs

5 years agoMerge branch 'release/1.1.1' into 'stable'
rinpatch [Fri, 18 Oct 2019 12:08:03 +0000 (12:08 +0000)]
Merge branch 'release/1.1.1' into 'stable'

1.1.1 Release

See merge request pleroma/pleroma!1857

5 years agoAdd a changelog entry for user search refactoring
rinpatch [Fri, 18 Oct 2019 11:57:13 +0000 (14:57 +0300)]
Add a changelog entry for user search refactoring

5 years agoRemove a failing search test due to it being unrealistic
rinpatch [Wed, 16 Oct 2019 12:09:39 +0000 (15:09 +0300)]
Remove a failing search test due to it being unrealistic
While the case tested (`lain@ple`) gives wrong ordering due to
using only trigram to order, it almost never happens in reality. In reality
it would be either `lain` (in which case it's fine to list the user with `lain`
in display name first), or `@lain@pleroma.soykaf.com`/`lain@pleroma.soykaf.com` (which is
handled fine as well)

5 years agoOrder fts results by trigram
rinpatch [Wed, 16 Oct 2019 10:49:33 +0000 (13:49 +0300)]
Order fts results by trigram

5 years agoUser search: Remove trigram and refactor the module
rinpatch [Wed, 16 Oct 2019 09:52:47 +0000 (12:52 +0300)]
User search: Remove trigram and refactor the module

- Remove trigram as it tends to rank garbage results highly, resulting
in it prioritized above fts, which gives actually decent results. ACKed
by kaniini and lain on irc.
- Remove a test for handling misspelled requests, since we no longer have
trigram
- Remove a test for searching users with `nil` display names, because it
is unrealistic, we don't accept usernames that are not >1 char strings
- Make rank boosting for followers/followees sane again, previous values
resulted in garbage matches getting on top just because the users are
followers/followees

5 years agoBump the version in mix.exs
rinpatch [Fri, 18 Oct 2019 11:53:13 +0000 (14:53 +0300)]
Bump the version in mix.exs

5 years agoMerge branch 'bugfix/jsonb-set-fuckup' into 'release/1.1.1'
rinpatch [Fri, 18 Oct 2019 11:49:27 +0000 (11:49 +0000)]
Merge branch 'bugfix/jsonb-set-fuckup' into 'release/1.1.1'

Fix a migration wiping user info of users that don't have any mutes

See merge request pleroma/pleroma!1856

5 years agoAdd a changelog entry for yet another jsonb_set data loss
rinpatch [Fri, 18 Oct 2019 11:40:47 +0000 (14:40 +0300)]
Add a changelog entry for yet another jsonb_set data loss

5 years agoAdd a test for safe_jsonb_set
rinpatch [Fri, 18 Oct 2019 11:33:51 +0000 (14:33 +0300)]
Add a test for safe_jsonb_set

5 years agoFix a migration wiping user info of users that don't have any mutes
rinpatch [Fri, 18 Oct 2019 11:11:30 +0000 (14:11 +0300)]
Fix a migration wiping user info of users that don't have any mutes

And introduce safe_jsonb_set

5 years agoMerge branch 'fix/version-branch-skip' into 'stable'
rinpatch [Mon, 14 Oct 2019 19:14:47 +0000 (19:14 +0000)]
Merge branch 'fix/version-branch-skip' into 'stable'

Fix hiding branch name logic

See merge request pleroma/pleroma!1845

5 years agoFix hiding branch name logic
rinpatch [Mon, 14 Oct 2019 19:13:18 +0000 (22:13 +0300)]
Fix hiding branch name logic

5 years agoMerge branch 'stable-fix-docs' into 'stable'
rinpatch [Mon, 14 Oct 2019 18:55:09 +0000 (18:55 +0000)]
Merge branch 'stable-fix-docs' into 'stable'

Fix documentation deploy for stable

See merge request pleroma/pleroma!1844

5 years agoFix documentation deploy for stable
rinpatch [Mon, 14 Oct 2019 18:53:01 +0000 (21:53 +0300)]
Fix documentation deploy for stable

5 years agoFix pleroma_ctl link
rinpatch [Mon, 14 Oct 2019 18:27:59 +0000 (21:27 +0300)]
Fix pleroma_ctl link

5 years agoMerge branch 'final-release-prep' into 'maint/1.1'
rinpatch [Mon, 14 Oct 2019 18:21:49 +0000 (18:21 +0000)]
Merge branch 'final-release-prep' into 'maint/1.1'

Final 1.1 release preparations

See merge request pleroma/pleroma!1843

5 years agoFinal 1.1 release preparations
rinpatch [Mon, 14 Oct 2019 18:19:19 +0000 (21:19 +0300)]
Final 1.1 release preparations

5 years agoMerge branch 'backport/1.1-branch-name-change' into 'maint/1.1'
rinpatch [Mon, 14 Oct 2019 16:47:27 +0000 (16:47 +0000)]
Merge branch 'backport/1.1-branch-name-change' into 'maint/1.1'

Backport/1.1 branch name change

See merge request pleroma/pleroma!1841

5 years agoCorrect version parser branch name detection
rinpatch [Mon, 14 Oct 2019 15:45:16 +0000 (18:45 +0300)]
Correct version parser branch name detection

5 years agoAdd a changelog entry for branch-moving
rinpatch [Mon, 14 Oct 2019 15:42:30 +0000 (18:42 +0300)]
Add a changelog entry for branch-moving

5 years agoPrepare pleroma_ctl for moving master to stable and relax the error
rinpatch [Mon, 14 Oct 2019 15:39:56 +0000 (18:39 +0300)]
Prepare pleroma_ctl for moving master to stable and relax the error
message

5 years agoPreparations for renaming `master` to `stable`
rinpatch [Mon, 14 Oct 2019 15:38:51 +0000 (18:38 +0300)]
Preparations for renaming `master` to `stable`

5 years agoMerge branch 'cherry-pick-930cbd6d' into 'maint/1.1'
rinpatch [Sat, 12 Oct 2019 14:54:49 +0000 (14:54 +0000)]
Merge branch 'cherry-pick-930cbd6d' into 'maint/1.1'

Backport mediaproxy failure tracking enchancements to maint

See merge request pleroma/pleroma!1837

5 years agoMerge branch 'fix/mediaproxy-too-brutal' into 'develop'
rinpatch [Sat, 12 Oct 2019 14:42:55 +0000 (14:42 +0000)]
Merge branch 'fix/mediaproxy-too-brutal' into 'develop'

Make MediaProxy failure tracking less brutal

See merge request pleroma/pleroma!1836

(cherry picked from commit 930cbd6d05653033e9f6d16960d698f5db4ae624)

9bdbf081 Make MediaProxy failure tracking less brutal

5 years agoMerge branch 'cherry-pick-44afe4c8' into 'maint/1.1'
rinpatch [Fri, 11 Oct 2019 19:39:37 +0000 (19:39 +0000)]
Merge branch 'cherry-pick-44afe4c8' into 'maint/1.1'

Backport pleroma-ctl enchancements to maint

See merge request pleroma/pleroma!1833

5 years agoMerge branch 'pleroma-ctl-enchancements' into 'develop'
Haelwenn [Fri, 11 Oct 2019 10:56:45 +0000 (10:56 +0000)]
Merge branch 'pleroma-ctl-enchancements' into 'develop'

pleroma_ctl: Make it possible to specify branches/flavours when updating

See merge request pleroma/pleroma!1832

(cherry picked from commit 44afe4c8870d14ae2cd22ff5cfa04555cf5907bd)

b750135a pleroma_ctl: Make it possible to specify branches/flavours when updating

5 years agoMerge branch 'backport/exclude-replies' into 'maint/1.1'
kaniini [Mon, 7 Oct 2019 13:12:46 +0000 (13:12 +0000)]
Merge branch 'backport/exclude-replies' into 'maint/1.1'

mastodon api: fix exclude_replies (closes #1287)

See merge request pleroma/pleroma!1816

5 years agomastodon api: fix exclude_replies (closes #1287)
Ariadne Conill [Mon, 7 Oct 2019 12:29:33 +0000 (12:29 +0000)]
mastodon api: fix exclude_replies (closes #1287)

5 years agoMerge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1'
kaniini [Mon, 7 Oct 2019 12:14:56 +0000 (12:14 +0000)]
Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1'

update changelog date

See merge request pleroma/pleroma!1812

5 years agoupdate changelog date
Ariadne Conill [Mon, 7 Oct 2019 12:14:04 +0000 (12:14 +0000)]
update changelog date

5 years agoMerge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1'
kaniini [Mon, 7 Oct 2019 12:12:45 +0000 (12:12 +0000)]
Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1'

Pleroma 1.0.91 (aka 1.1 RC2).

See merge request pleroma/pleroma!1811

5 years agoPleroma 1.0.91 (aka 1.1 RC2).
Ariadne Conill [Mon, 7 Oct 2019 12:10:36 +0000 (12:10 +0000)]
Pleroma 1.0.91 (aka 1.1 RC2).

5 years agoMerge branch 'backport/remove-direct-messages-from-public-timeline' into 'maint/1.1'
kaniini [Mon, 7 Oct 2019 11:40:31 +0000 (11:40 +0000)]
Merge branch 'backport/remove-direct-messages-from-public-timeline' into 'maint/1.1'

backport: Mastodon API: Fix private and direct statuses not being filtered out from the...

See merge request pleroma/pleroma!1807

5 years agoMerge branch 'backport/chore-context-cleanups' into 'maint/1.1'
kaniini [Mon, 7 Oct 2019 11:37:01 +0000 (11:37 +0000)]
Merge branch 'backport/chore-context-cleanups' into 'maint/1.1'

clean up bundled litepub schema (closes #1303)

See merge request pleroma/pleroma!1809

5 years agoclean up bundled litepub schema (closes #1303)
Ariadne Conill [Mon, 7 Oct 2019 11:33:58 +0000 (11:33 +0000)]
clean up bundled litepub schema (closes #1303)

5 years agoMastodon API: Fix private and direct statuses not being filtered out from the public...
eugenijm [Fri, 20 Sep 2019 14:54:38 +0000 (17:54 +0300)]
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)

5 years agoMerge branch 'backport/custom-field-update' into 'maint/1.1'
kaniini [Sun, 6 Oct 2019 15:33:33 +0000 (15:33 +0000)]
Merge branch 'backport/custom-field-update' into 'maint/1.1'

Backport: custom field update

See merge request pleroma/pleroma!1805

5 years agoMerge branch 'backport/key-moveout-1.1' into 'maint/1.1'
rinpatch [Sun, 6 Oct 2019 15:32:33 +0000 (15:32 +0000)]
Merge branch 'backport/key-moveout-1.1' into 'maint/1.1'

Backport moving out keys from user info to 1.1

See merge request pleroma/pleroma!1801

5 years agochangelog
Ariadne Conill [Sun, 6 Oct 2019 15:17:33 +0000 (15:17 +0000)]
changelog

5 years agoFix muted notification migration only working with a schema
rinpatch [Sun, 6 Oct 2019 14:53:03 +0000 (17:53 +0300)]
Fix muted notification migration only working with a schema

Should also improve performance. I tested it on my local DB, but if
anyone has a backup of <=1.0 db they can test this on, please do

5 years agoExtract if block into private function
kPherox [Mon, 26 Aug 2019 08:09:32 +0000 (17:09 +0900)]
Extract if block into private function

5 years agoUpdate test for custom fields when content-type urlencoded
kPherox [Sun, 25 Aug 2019 18:49:47 +0000 (03:49 +0900)]
Update test for custom fields when content-type urlencoded

5 years agoUpdate test for custom fields when name empty string
kPherox [Sun, 25 Aug 2019 18:25:06 +0000 (03:25 +0900)]
Update test for custom fields when name empty string

5 years agoChange to delete empty name field
kPherox [Sat, 24 Aug 2019 22:04:46 +0000 (07:04 +0900)]
Change to delete empty name field

5 years agoFix type of fields_attributes
kPherox [Sat, 24 Aug 2019 22:02:32 +0000 (07:02 +0900)]
Fix type of fields_attributes

Convert tuple list to map list when parameters is `:urlencoded` or `:multipart`

5 years agoRename fields to fields_attributes
kPherox [Sat, 24 Aug 2019 21:51:05 +0000 (06:51 +0900)]
Rename fields to fields_attributes

5 years agoMerge branch 'backport/feature-poll-refresh' into 'maint/1.1'
kaniini [Sun, 6 Oct 2019 15:07:38 +0000 (15:07 +0000)]
Merge branch 'backport/feature-poll-refresh' into 'maint/1.1'

backport: poll refreshing

See merge request pleroma/pleroma!1804

5 years agoMerge branch 'backport/fix-report-email' into 'maint/1.1'
kaniini [Sun, 6 Oct 2019 14:59:58 +0000 (14:59 +0000)]
Merge branch 'backport/fix-report-email' into 'maint/1.1'

backport: Use the user.id instead of nickname in report URLs

See merge request pleroma/pleroma!1802

5 years agoadd changelog
Ariadne Conill [Sun, 6 Oct 2019 14:54:44 +0000 (14:54 +0000)]
add changelog

5 years agoFix credo issues
rinpatch [Wed, 18 Sep 2019 19:09:03 +0000 (22:09 +0300)]
Fix credo issues

5 years agoDo not refetch local objects
rinpatch [Wed, 18 Sep 2019 16:59:23 +0000 (19:59 +0300)]
Do not refetch local objects

5 years agoPreserve internal fields when reinjecting
rinpatch [Wed, 18 Sep 2019 16:53:51 +0000 (19:53 +0300)]
Preserve internal fields when reinjecting

5 years agoMove object internal fields to a constant
rinpatch [Wed, 18 Sep 2019 16:24:20 +0000 (19:24 +0300)]
Move object internal fields to a constant

5 years agoSet updated_at even if the object stayed the same
rinpatch [Wed, 18 Sep 2019 16:07:25 +0000 (19:07 +0300)]
Set updated_at even if the object stayed the same

5 years agoFix wrong argument order when calling NaiveDateTime.diff
rinpatch [Wed, 18 Sep 2019 15:52:33 +0000 (18:52 +0300)]
Fix wrong argument order when calling NaiveDateTime.diff

5 years agoCapture log in object refetch tests
rinpatch [Wed, 18 Sep 2019 15:31:24 +0000 (18:31 +0300)]
Capture log in object refetch tests

5 years agoInitial poll refresh support
rinpatch [Wed, 18 Sep 2019 15:13:21 +0000 (18:13 +0300)]
Initial poll refresh support

Implement refreshing the object with an interval and call the function
when getting the poll.

5 years agoUse the user.id instead of nickname in report URLs
feld [Sun, 6 Oct 2019 14:13:04 +0000 (14:13 +0000)]
Use the user.id instead of nickname in report URLs

Ensures links to profiles of remote users work.

5 years agoFix the use of queries with a schema in a migration
rinpatch [Sun, 6 Oct 2019 14:05:51 +0000 (17:05 +0300)]
Fix the use of queries with a schema in a migration

5 years agoMove local keys out of `user.info`
rinpatch [Sun, 6 Oct 2019 13:22:35 +0000 (16:22 +0300)]
Move local keys out of `user.info`

5 years agoMerge branch 'backport/update-activity-fixes' into 'maint/1.1'
kaniini [Sat, 5 Oct 2019 19:46:23 +0000 (19:46 +0000)]
Merge branch 'backport/update-activity-fixes' into 'maint/1.1'

backport update activity fixes to maint/1.1

See merge request pleroma/pleroma!1797

5 years agoupdate changelog
Ariadne Conill [Sat, 5 Oct 2019 19:32:23 +0000 (19:32 +0000)]
update changelog

5 years agoCommonAPI: Create profile updates as public.
lain [Sat, 5 Oct 2019 12:53:50 +0000 (14:53 +0200)]
CommonAPI: Create profile updates as public.

This saves us lots of sending out because we can use sharedInbox.

5 years agoActivityPub / Transmogrifier: Correctly store incoming Update id.
lain [Sat, 5 Oct 2019 12:49:45 +0000 (14:49 +0200)]
ActivityPub / Transmogrifier: Correctly store incoming Update id.

5 years agoMerge branch 'backport/bugfix-notification-nil-actor' into 'maint/1.1'
kaniini [Fri, 4 Oct 2019 22:37:45 +0000 (22:37 +0000)]
Merge branch 'backport/bugfix-notification-nil-actor' into 'maint/1.1'

backport MR 1779 to maint/1.1

See merge request pleroma/pleroma!1791

5 years agoupdate changelog
Ariadne Conill [Fri, 4 Oct 2019 21:43:15 +0000 (21:43 +0000)]
update changelog

5 years agonotification_view.ex: Make sure `account` isn’t empty
Haelwenn (lanodan) Monnier [Fri, 4 Oct 2019 04:47:36 +0000 (06:47 +0200)]
notification_view.ex: Make sure `account` isn’t empty

Related: https://git.pleroma.social/pleroma/pleroma/issues/1203

5 years agoMerge branch 'backport/hex-flake-id' into 'maint/1.1'
kaniini [Fri, 4 Oct 2019 22:11:34 +0000 (22:11 +0000)]
Merge branch 'backport/hex-flake-id' into 'maint/1.1'

backport: hex `flake_id` support

See merge request pleroma/pleroma!1793

5 years agoMerge branch 'backport/feature-track-reverse-proxy-failures' into 'maint/1.1'
kaniini [Fri, 4 Oct 2019 22:01:38 +0000 (22:01 +0000)]
Merge branch 'backport/feature-track-reverse-proxy-failures' into 'maint/1.1'

backport: Track failed proxy urls and don't request them again

See merge request pleroma/pleroma!1792

5 years agochangelog
Ariadne Conill [Fri, 4 Oct 2019 22:00:18 +0000 (22:00 +0000)]
changelog

5 years agoReplace `Pleroma.FlakeId` with `flake_id` hex package
Egor Kislitsyn [Wed, 18 Sep 2019 14:54:31 +0000 (21:54 +0700)]
Replace `Pleroma.FlakeId` with `flake_id` hex package

5 years agoTrack failed proxy urls and don't request them again
Sergey Suprunenko [Tue, 1 Oct 2019 20:00:27 +0000 (20:00 +0000)]
Track failed proxy urls and don't request them again

5 years agoMerge branch 'backport/issue-1296' into 'maint/1.1'
kaniini [Fri, 4 Oct 2019 21:47:34 +0000 (21:47 +0000)]
Merge branch 'backport/issue-1296' into 'maint/1.1'

backport 1296 fix to maint/1.1

See merge request pleroma/pleroma!1790

5 years agoupdate changelog
Ariadne Conill [Fri, 4 Oct 2019 21:36:49 +0000 (21:36 +0000)]
update changelog

5 years agoremoved legacy api: "/objects/:uuid/likes"
Maksim Pechnikov [Fri, 4 Oct 2019 19:20:53 +0000 (22:20 +0300)]
removed legacy api: "/objects/:uuid/likes"

5 years agoMerge branch 'backport/undo-fixes' into 'maint/1.1'
kaniini [Fri, 4 Oct 2019 21:29:01 +0000 (21:29 +0000)]
Merge branch 'backport/undo-fixes' into 'maint/1.1'

backport: undo fixes

See merge request pleroma/pleroma!1789

5 years agoupdate changelog
Ariadne Conill [Fri, 4 Oct 2019 21:18:38 +0000 (21:18 +0000)]
update changelog

5 years agoActivityPub.Utils: Fix undo test.
lain [Fri, 4 Oct 2019 15:10:49 +0000 (17:10 +0200)]
ActivityPub.Utils: Fix undo test.

5 years agoActivityPub: Change addressing of Undo.
lain [Fri, 4 Oct 2019 14:32:42 +0000 (16:32 +0200)]
ActivityPub: Change addressing of Undo.

5 years agoMerge branch 'chore/1.1-changelog-fixup' into 'maint/1.1'
kaniini [Fri, 4 Oct 2019 18:23:33 +0000 (18:23 +0000)]
Merge branch 'chore/1.1-changelog-fixup' into 'maint/1.1'

Sync 1.1.0 changelog with develop

See merge request pleroma/pleroma!1787

5 years agoRemove entries from develop that were in the section for some reason
rinpatch [Fri, 4 Oct 2019 18:19:17 +0000 (21:19 +0300)]
Remove entries from develop that were in the section for some reason

5 years agoAdd back streaming fix entry
rinpatch [Fri, 4 Oct 2019 18:17:29 +0000 (21:17 +0300)]
Add back streaming fix entry

5 years agoSync 1.1.0 changelog with develop
rinpatch [Fri, 4 Oct 2019 18:13:35 +0000 (21:13 +0300)]
Sync 1.1.0 changelog with develop

Mostly !1724 backport, but as a new commit because it was easier
this way

5 years agoMerge branch 'bugfix/widen-streamer-blocks-for-1.1' into 'maint/1.1'
kaniini [Fri, 4 Oct 2019 17:39:28 +0000 (17:39 +0000)]
Merge branch 'bugfix/widen-streamer-blocks-for-1.1' into 'maint/1.1'

widen streaming API blocks (for 1.1)

See merge request pleroma/pleroma!1785

5 years agoMerge branch 'backport/1.1-mastoapi-nickname-fix' into 'maint/1.1'
kaniini [Fri, 4 Oct 2019 17:39:20 +0000 (17:39 +0000)]
Merge branch 'backport/1.1-mastoapi-nickname-fix' into 'maint/1.1'

Backport !1777 to 1.1

See merge request pleroma/pleroma!1786

5 years agoFix get_cached_by_nickname_or_id not allowing to get local users by
rinpatch [Thu, 3 Oct 2019 22:05:50 +0000 (01:05 +0300)]
Fix get_cached_by_nickname_or_id not allowing to get local users by
nickname

Closes #1293

5 years agotests: add missing ExUnit.CaptureLog
Ariadne Conill [Fri, 4 Oct 2019 16:45:14 +0000 (16:45 +0000)]
tests: add missing ExUnit.CaptureLog

5 years agoapplication: fix up after_supervisor_start removal backport
Ariadne Conill [Fri, 4 Oct 2019 16:15:54 +0000 (16:15 +0000)]
application: fix up after_supervisor_start removal backport

5 years agoupdate changelog
Ariadne Conill [Fri, 4 Oct 2019 15:45:06 +0000 (15:45 +0000)]
update changelog

5 years agostreamer: worker: actually use should_send? consistently
Ariadne Conill [Fri, 4 Oct 2019 15:42:25 +0000 (15:42 +0000)]
streamer: worker: actually use should_send? consistently

5 years agostreamer: worker: check for lack of intersectionality between a user's blocklist...
Ariadne Conill [Fri, 4 Oct 2019 15:41:55 +0000 (15:41 +0000)]
streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist

5 years agostreamer: add missing copyright headers
Ariadne Conill [Fri, 4 Oct 2019 15:21:45 +0000 (15:21 +0000)]
streamer: add missing copyright headers

5 years agotests: streamer: add a test for blocked transitive activities
Ariadne Conill [Fri, 4 Oct 2019 15:17:32 +0000 (15:17 +0000)]
tests: streamer: add a test for blocked transitive activities

5 years agoremove remaining errors from tests
Steven Fuchs [Tue, 17 Sep 2019 14:44:52 +0000 (14:44 +0000)]
remove remaining errors from tests

5 years agoRevert "Merge branch 'revert-4fabf83a' into 'develop'"
Egor Kislitsyn [Mon, 16 Sep 2019 10:03:37 +0000 (17:03 +0700)]
Revert "Merge branch 'revert-4fabf83a' into 'develop'"

This reverts commit fe7fd331263007e0fb2877ef7370a09a9704da36, reversing
changes made to 4fabf83ad01352442906d79187aeab4c777f4df8.