feld
764931fc9f
Merge branch 'deps/update-tesla' into 'develop'
...
Update Tesla to 1.3
Closes #1262
See merge request pleroma/pleroma!1684
2019-09-17 19:37:29 +00:00
79376abae3
Merge branch 'support/package_versions' into 'develop'
...
[#1263 ] fixed ecto version
See merge request pleroma/pleroma!1685
2019-09-17 19:12:24 +00:00
ef2e2c5e12
Merge branch 'feature/return-total-for-reports' into 'develop'
...
Admin API: Return total for reports
See merge request pleroma/pleroma!1628
2019-09-17 19:09:56 +00:00
d201eec45c
fixed ecto version
2019-09-17 22:02:37 +03:00
8d812c28a7
Update Tesla to 1.3
...
This version includes a couple of fixes, adds Gun and Mint adapters and
removes 0.x -> 1.0 config migrator, which for some reason fails under
certain conditions. I had to set `override: true` because Quack pins
Tesla to `1.2.0`, but I have looked through the source code and verified
that updating Tesla doesn't break anything there.
2019-09-17 21:51:50 +03:00
7318095657
Merge branch 'fix-notification-warnings' into 'develop'
...
Fix notification warnings
See merge request pleroma/pleroma!1683
2019-09-17 18:12:27 +00:00
6193157f19
Fix notification warnings
2019-09-17 18:12:27 +00:00
2301de3d75
Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'
...
Fix `Transmogrifier.upgrade_user_from_ap_id/1`
See merge request pleroma/pleroma!1677
2019-09-17 17:16:39 +00:00
95a4a19417
Merge branch 'support/tests' into 'develop'
...
add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627
2019-09-17 14:47:26 +00:00
1fc8fabecf
Merge branch 'eliminate-test-errors' into 'develop'
...
remove remaining errors from tests
See merge request pleroma/pleroma!1682
2019-09-17 14:44:52 +00:00
80c5c3495b
remove remaining errors from tests
2019-09-17 14:44:52 +00:00
bb6d172e74
Merge branch 'deps/update-oban' into 'develop'
...
Update oban to 0.8.1
Closes #1261
See merge request pleroma/pleroma!1680
2019-09-17 13:55:01 +00:00
a21584556f
Update oban to 0.8.1
...
This version uses a different locking mechanism, which gets rid of
`WARNING: you don't own a lock of type ShareLock` log spam
2019-09-17 13:04:43 +03:00
a58f29b826
Merge branch 'update-fields-limit' into 'develop'
...
Set `account_field_value_length` limit to 2048 by default
Closes #1249
See merge request pleroma/pleroma!1678
2019-09-16 15:11:05 +00:00
d6ab78e610
Set `account_field_value_length` limit to 2048 by default
2019-09-16 21:48:01 +07:00
085d014f08
Fix `Transmogrifier.upgrade_user_from_ap_id/1`
2019-09-16 19:26:00 +07:00
219dca1b00
Merge branch 'develop' into feature/return-total-for-reports
2019-09-16 14:40:17 +03:00
409e701ab8
Merge branch 'fix/develop' into 'develop'
...
Add "Streamer refactoring" back to `develop`
See merge request pleroma/pleroma!1675
2019-09-16 10:59:44 +00:00
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
2019-09-16 17:55:04 +07:00
4397a3fe4a
Merge branch 'fix/signed-fetch-inclusion-test' into 'develop'
...
Fix signed fetch inclusion publisher test
See merge request pleroma/pleroma!1676
2019-09-16 10:34:03 +00:00
e8120944d8
Fix signed fetch inclusion publisher test
...
Oban branch changed `actor` to `actor_id` and this test was not adjusted for that
2019-09-16 13:23:06 +03:00
fe7fd33126
Merge branch 'revert-4fabf83a' into 'develop'
...
Revert "Merge branch 'streamer-refactoring' into 'develop'"
See merge request pleroma/pleroma!1674
2019-09-16 09:09:32 +00:00
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
2019-09-16 09:09:21 +00:00
4fabf83ad0
Merge branch 'streamer-refactoring' into 'develop'
...
Streamer refactoring
See merge request pleroma/pleroma!1653
2019-09-16 07:44:03 +00:00
aab264db82
Streamer refactoring
2019-09-16 07:44:03 +00:00
17142a3720
Merge branch 'feature/delivery-tracking' into 'develop'
...
Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661
2019-09-16 07:39:58 +00:00
d1a84ceec8
Merge branch 'feature/optimize_rich_media_parser' into 'develop'
...
added prepare html for RichMedia.Parser
See merge request pleroma/pleroma!1672
2019-09-16 07:37:54 +00:00
74eba5afe2
Merge branch 'fix/race-in-tests' into 'develop'
...
Fix a race condition in tests
See merge request pleroma/pleroma!1673
2019-09-16 07:36:57 +00:00
ca88e37a8f
Fix a race condition in tests
2019-09-16 12:55:05 +07:00
2990c0a53b
Merge branch '1149-oban-job-queue' into 'develop'
...
[#1149 ] `oban`-based job & retry queues
Closes #1149
See merge request pleroma/pleroma!1518
2019-09-15 20:22:17 +00:00
b4cf74c106
added prepare html for RichMedia.Parser
2019-09-15 14:53:58 +03:00
8751809e1e
Merge branch 'develop' into support/tests
2019-09-15 14:22:15 +03:00
3b8ec98b0e
[ #1149 ] Reinstated docs/config.md changes.
2019-09-15 10:15:57 +03:00
610236d6be
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
2019-09-15 10:12:24 +03:00
9c64a25713
Merge branch 'config-changes' into 'develop'
...
two separate files for config.md and generated config.md
See merge request pleroma/pleroma!1666
2019-09-14 17:26:35 +00:00
62bbba80f3
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
...
Truncate remote user fields
See merge request pleroma/pleroma!1619
2019-09-14 16:39:42 +00:00
e127b9ab6d
[ #1149 ] Rewritten readme as config/description.exs.
2019-09-14 16:28:59 +03:00
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
2019-09-14 16:11:44 +03:00
3ae448b592
Merge branch 'fix-tests' into 'develop'
...
Fix `Activity.all_by_actor_and_id/2` test
See merge request pleroma/pleroma!1668
2019-09-14 12:36:08 +00:00
b870ae08fd
Fix `Activity.all_by_actor_and_id/2` test
2019-09-14 19:31:20 +07:00
4264c4b7e5
Merge branch 'security/fav-reblog-access-control' into 'develop'
...
Mastodon API: Respect post privacy in favourited/reblogged endpoints
See merge request pleroma/pleroma!1667
2019-09-14 11:44:34 +00:00
a78a7ee455
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
2019-09-14 10:50:08 +00:00
85b6144ffd
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
2019-09-14 10:46:35 +00:00
5c5ebd3861
Mastodon API: Respect post privacy in favourited/reblogged endpoints
2019-09-14 01:50:15 +03:00
a9b78f55e3
Merge branch 'capture-test-errors' into 'develop'
...
Capture test error messages where appropriate
See merge request pleroma/pleroma!1665
2019-09-13 17:07:14 +00:00
1be09bde2d
Merge branch 'refactor/add_link_headers' into 'develop'
...
Refactor `add_link_headers/7` -> `add_link_headers/3`
See merge request pleroma/pleroma!1636
2019-09-13 17:06:38 +00:00
ba70a8cae6
Merge branch 'develop' into feature/delivery-tracking
2019-09-13 19:42:53 +03:00
ac4a748fad
Disallow NULLs in deliveries
2019-09-13 19:28:35 +03:00
4da0da9aa4
don't track generated_config.md
2019-09-13 19:13:04 +03:00
c625fe6f09
config.md back
2019-09-13 19:03:39 +03:00
feld
rinpatch