Alexander Strizhakov [Mon, 9 Mar 2020 07:56:33 +0000 (10:56 +0300)]
Merge branch 'develop' into gun
rinpatch [Sun, 8 Mar 2020 20:31:54 +0000 (20:31 +0000)]
Merge branch 'chore/mix-version-bump' into 'develop'
mix.exs: bump version to development one
See merge request pleroma/pleroma!2279
rinpatch [Sun, 8 Mar 2020 20:24:30 +0000 (23:24 +0300)]
mix.exs: bump version to development one
rinpatch [Sun, 8 Mar 2020 13:42:15 +0000 (13:42 +0000)]
Merge branch 'stable' into 'develop'
Sync develop with stable
Closes #1262, #1267, #1293, #1303, #1287, #1291, #1382, #1438, #1129, #1109, and #1606
See merge request pleroma/pleroma!2278
rinpatch [Sun, 8 Mar 2020 10:38:35 +0000 (10:38 +0000)]
Merge branch 'release/2.0.0' into 'stable'
Release/2.0.0
See merge request pleroma/pleroma!2273
rinpatch [Sat, 7 Mar 2020 15:18:43 +0000 (18:18 +0300)]
rinpatch [Sat, 7 Mar 2020 14:45:00 +0000 (14:45 +0000)]
Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0'
moderation log: fix improperly migrated data
See merge request pleroma/pleroma!2277
rinpatch [Sat, 7 Mar 2020 10:51:28 +0000 (13:51 +0300)]
moderation log: fix improperly migrated data
Some of the actions used to have a user map as a subject, which was then
changed to an array of user maps. However instead of migrating old data
there was just a hack to transform it every time, moreover this hack
didn't include all possible actions, which resulted in crashes. This
commit fixes the crashes by introducing a proper database migration for old data.
Closes #1606
Alexander Strizhakov [Tue, 18 Feb 2020 15:10:39 +0000 (18:10 +0300)]
wait in mix task while pleroma is rebooted
Alexander Strizhakov [Sat, 7 Mar 2020 09:41:37 +0000 (12:41 +0300)]
Merge branch 'develop' into gun
rinpatch [Sat, 7 Mar 2020 09:32:29 +0000 (09:32 +0000)]
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
Wait in mix task while pleroma is rebooted
See merge request pleroma/pleroma!2225
Alexander Strizhakov [Sat, 7 Mar 2020 09:24:39 +0000 (12:24 +0300)]
start gun upload pool, if proxy_remote is enabled
Alexander Strizhakov [Sat, 7 Mar 2020 08:01:37 +0000 (11:01 +0300)]
tests changes
Alexander Strizhakov [Sat, 7 Mar 2020 07:12:34 +0000 (10:12 +0300)]
using `stub` instead `expect`
rinpatch [Fri, 6 Mar 2020 20:23:39 +0000 (20:23 +0000)]
Merge branch 'update/adminfe-2.0.0-release' into 'release/2.0.0'
Remove EmojiPacks from AdminFE build
See merge request pleroma/pleroma!2275
Alexander Strizhakov [Fri, 6 Mar 2020 18:24:19 +0000 (21:24 +0300)]
little polishing
Alexander Strizhakov [Fri, 6 Mar 2020 18:04:18 +0000 (21:04 +0300)]
little refactor
Alexander Strizhakov [Fri, 6 Mar 2020 17:23:58 +0000 (20:23 +0300)]
removing GunMock to use Mox
feld [Fri, 6 Mar 2020 16:03:24 +0000 (16:03 +0000)]
Merge branch 'revert-
67cc4dce' into 'develop'
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"
See merge request pleroma/pleroma!2276
feld [Fri, 6 Mar 2020 15:56:41 +0000 (15:56 +0000)]
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"
This reverts merge request !2274
Mark Felder [Fri, 6 Mar 2020 15:54:38 +0000 (09:54 -0600)]
Remove EmojiPacks from AdminFE build
Once more, with feeling
lain [Fri, 6 Mar 2020 15:14:10 +0000 (15:14 +0000)]
Merge branch 'update/admin-fe-without-emojipack' into 'develop'
Remove emoji support from AdminFE
See merge request pleroma/pleroma!2274
Mark Felder [Fri, 6 Mar 2020 13:53:33 +0000 (07:53 -0600)]
Remove emoji support from AdminFE
rinpatch [Thu, 5 Mar 2020 20:41:47 +0000 (23:41 +0300)]
rinpatch [Thu, 5 Mar 2020 19:38:38 +0000 (22:38 +0300)]
Merge branch 'stable' into release/2.0.0
rinpatch [Thu, 5 Mar 2020 19:36:35 +0000 (22:36 +0300)]
Merge branch 'stable' into release/2.0.0
rinpatch [Thu, 5 Mar 2020 19:35:23 +0000 (22:35 +0300)]
version bump changelog and mix version
rinpatch [Thu, 5 Mar 2020 19:28:37 +0000 (22:28 +0300)]
changelog: sync with stable
Alexander Strizhakov [Thu, 5 Mar 2020 15:57:45 +0000 (18:57 +0300)]
removing integration tests
Alexander Strizhakov [Thu, 5 Mar 2020 15:28:04 +0000 (18:28 +0300)]
returning, not needed
Alexander Strizhakov [Thu, 5 Mar 2020 14:31:06 +0000 (17:31 +0300)]
removing try block in tesla request
added mocks for tests which fail with Tesla.Mock.Error
lain [Thu, 5 Mar 2020 11:49:51 +0000 (11:49 +0000)]
Merge branch 'proper_error_messages' into 'develop'
MastodonController: Return 404 errors correctly.
See merge request pleroma/pleroma!2270
lain [Thu, 5 Mar 2020 11:42:02 +0000 (12:42 +0100)]
Admin API tests: Fix wrong test.
Haelwenn [Thu, 5 Mar 2020 07:25:23 +0000 (07:25 +0000)]
Merge branch 'fix/stats-on-startup' into 'develop'
Generate instance stats on startup
Closes #1598
See merge request pleroma/pleroma!2271
Alexander Strizhakov [Thu, 5 Mar 2020 06:51:52 +0000 (09:51 +0300)]
removing try block in getting gun info
Mark Felder [Wed, 4 Mar 2020 19:41:04 +0000 (13:41 -0600)]
Document the instance stats fix
Mark Felder [Wed, 4 Mar 2020 19:33:26 +0000 (13:33 -0600)]
Generate instance stats on startup
feld [Wed, 4 Mar 2020 18:22:37 +0000 (18:22 +0000)]
Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
Closes #1596
See merge request pleroma/pleroma!2267
Alexander Strizhakov [Wed, 4 Mar 2020 17:09:18 +0000 (20:09 +0300)]
adding descriptions
lain [Wed, 4 Mar 2020 17:09:06 +0000 (18:09 +0100)]
MastodonController: Return 404 errors correctly.
Alexander Strizhakov [Wed, 4 Mar 2020 16:44:03 +0000 (19:44 +0300)]
updating tesla ref
Alexander Strizhakov [Wed, 4 Mar 2020 15:13:24 +0000 (18:13 +0300)]
moving some logic to tesla adapter
- checking original inside gun adapter
- flushing streams on max_body error
lain [Wed, 4 Mar 2020 12:43:06 +0000 (12:43 +0000)]
Merge branch 'fix/no-email-no-fail' into 'develop'
Do not fail when user has no email
See merge request pleroma/pleroma!2249
Alexander Strizhakov [Wed, 4 Mar 2020 06:41:23 +0000 (09:41 +0300)]
same copyright date format
Alexander Strizhakov [Wed, 4 Mar 2020 06:23:42 +0000 (09:23 +0300)]
otp version
Alexander Strizhakov [Wed, 4 Mar 2020 05:56:36 +0000 (08:56 +0300)]
retry_timeout description change
Mark Felder [Tue, 3 Mar 2020 23:16:24 +0000 (17:16 -0600)]
Update Copyrights for gun related files
Mark Felder [Tue, 3 Mar 2020 23:15:49 +0000 (17:15 -0600)]
Merge branch 'develop' into gun
Haelwenn [Tue, 3 Mar 2020 23:15:12 +0000 (23:15 +0000)]
Merge branch 'chore/update-copyrights' into 'develop'
Update Copyrights
See merge request pleroma/pleroma!2269
Mark Felder [Tue, 3 Mar 2020 22:46:45 +0000 (16:46 -0600)]
Older copyright updates
Mark Felder [Tue, 3 Mar 2020 22:44:49 +0000 (16:44 -0600)]
Update Copyrights
Alexander Strizhakov [Tue, 3 Mar 2020 16:24:14 +0000 (19:24 +0300)]
refactoring for gun api modules
Alexander Strizhakov [Tue, 3 Mar 2020 15:57:16 +0000 (18:57 +0300)]
don't test gun itself
Alexander Strizhakov [Tue, 3 Mar 2020 15:53:44 +0000 (18:53 +0300)]
adapter renaming to adapter_helper
Alexander Strizhakov [Tue, 3 Mar 2020 15:01:35 +0000 (18:01 +0300)]
retry and retry_timeout settings default change
Alexander Strizhakov [Tue, 3 Mar 2020 14:44:04 +0000 (17:44 +0300)]
no try block in checkout connection
Alexander Strizhakov [Tue, 3 Mar 2020 14:32:59 +0000 (17:32 +0300)]
proxy parse tests fix
Alexander Strizhakov [Tue, 3 Mar 2020 14:27:56 +0000 (17:27 +0300)]
remove try block from pool request
Alexander Strizhakov [Tue, 3 Mar 2020 14:27:22 +0000 (17:27 +0300)]
proxy parsing errors
Alexander Strizhakov [Tue, 3 Mar 2020 13:51:49 +0000 (16:51 +0300)]
poolboy timeout fix
Alexander Strizhakov [Tue, 3 Mar 2020 13:46:20 +0000 (16:46 +0300)]
unnecessary mock
Alexander Strizhakov [Tue, 3 Mar 2020 13:27:46 +0000 (16:27 +0300)]
return error if connection failed to open
Alexander Strizhakov [Tue, 3 Mar 2020 13:08:21 +0000 (16:08 +0300)]
naming
Alexander Strizhakov [Tue, 3 Mar 2020 12:44:13 +0000 (15:44 +0300)]
simplification of formatting host method
case for format_proxy method
Alexander Strizhakov [Tue, 3 Mar 2020 12:12:09 +0000 (15:12 +0300)]
removing unused method
Alexander Strizhakov [Tue, 3 Mar 2020 12:11:48 +0000 (15:11 +0300)]
unnecessary with
Alexander Strizhakov [Tue, 3 Mar 2020 11:56:49 +0000 (14:56 +0300)]
removing unnecessary with
comment in tesla client impovement
Alexander Strizhakov [Tue, 3 Mar 2020 10:24:19 +0000 (13:24 +0300)]
hiding raise error logic to otp_version module
Alexander Strizhakov [Tue, 3 Mar 2020 10:05:28 +0000 (13:05 +0300)]
naming for checkin from pool timeout
Alexander Strizhakov [Tue, 3 Mar 2020 09:53:37 +0000 (09:53 +0000)]
Apply suggestion to lib/pleroma/reverse_proxy/client/tesla.ex
Alexander Strizhakov [Tue, 3 Mar 2020 09:53:31 +0000 (09:53 +0000)]
Apply suggestion to lib/pleroma/pool/connections.ex
Alexander Strizhakov [Tue, 3 Mar 2020 09:52:01 +0000 (09:52 +0000)]
Apply suggestion to lib/pleroma/http/http.ex
Alexander Strizhakov [Tue, 3 Mar 2020 09:50:42 +0000 (09:50 +0000)]
Apply suggestion to lib/pleroma/http/http.ex
Alexander Strizhakov [Tue, 3 Mar 2020 09:46:53 +0000 (09:46 +0000)]
Apply suggestion to lib/pleroma/http/request_builder.ex
Alexander Strizhakov [Tue, 3 Mar 2020 09:45:18 +0000 (09:45 +0000)]
Apply suggestion to docs/configuration/cheatsheet.md
Alexander Strizhakov [Tue, 3 Mar 2020 09:34:36 +0000 (09:34 +0000)]
Apply suggestion to lib/pleroma/http/adapter.ex
Alexander Strizhakov [Tue, 3 Mar 2020 09:29:57 +0000 (09:29 +0000)]
Apply suggestion to lib/pleroma/pool/connections.ex
Alexander Strizhakov [Tue, 3 Mar 2020 09:29:51 +0000 (09:29 +0000)]
Apply suggestion to lib/pleroma/pool/connections.ex
Alexander Strizhakov [Tue, 3 Mar 2020 09:19:29 +0000 (12:19 +0300)]
otp_version refactor
Alexander Strizhakov [Tue, 3 Mar 2020 07:33:40 +0000 (10:33 +0300)]
debug logs on pleroma restart
Alexander Strizhakov [Tue, 3 Mar 2020 07:08:07 +0000 (10:08 +0300)]
Merge branch 'develop' into gun
Mark Felder [Mon, 2 Mar 2020 19:00:05 +0000 (13:00 -0600)]
Clarify in docs how to control connections_pool for Gun.
It could easily be confused with the Hackney settings.
Mark Felder [Mon, 2 Mar 2020 18:52:41 +0000 (12:52 -0600)]
Move Tesla repo to our GitLab
lain [Mon, 2 Mar 2020 17:00:04 +0000 (17:00 +0000)]
Merge branch 'prepared-statements-settings' into 'develop'
Prepared statements settings
See merge request pleroma/pleroma!2238
eugenijm [Mon, 2 Mar 2020 13:47:30 +0000 (16:47 +0300)]
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
rinpatch [Mon, 2 Mar 2020 10:05:03 +0000 (10:05 +0000)]
Merge branch 'docs_cheatsheet_fix' into 'develop'
fix for :fetch_initial_posts
See merge request pleroma/pleroma!2266
ilja [Mon, 2 Mar 2020 09:29:24 +0000 (10:29 +0100)]
fix for :fetch_initial_posts
A warning was added, but their were some newlines and whitespaces missing which broke the rendering of the setting. I've added them now
Haelwenn [Mon, 2 Mar 2020 07:58:01 +0000 (07:58 +0000)]
Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
ActivityPub actions & side-effects in transaction
Closes #1482
See merge request pleroma/pleroma!2089
Alexander Strizhakov [Mon, 2 Mar 2020 07:01:07 +0000 (10:01 +0300)]
stop connections manually
Alexander Strizhakov [Mon, 2 Mar 2020 06:22:34 +0000 (09:22 +0300)]
returning repo parameters
Haelwenn [Mon, 2 Mar 2020 05:15:13 +0000 (05:15 +0000)]
Merge branch 'chores/bump-copyright' into 'develop'
Bump copyright
See merge request pleroma/pleroma!2265
Haelwenn (lanodan) Monnier [Mon, 2 Mar 2020 05:08:45 +0000 (06:08 +0100)]
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff
fcd5dd259a1700a045be902b43391b0d1bd58a5b --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
Haelwenn (lanodan) Monnier [Mon, 2 Mar 2020 04:54:39 +0000 (05:54 +0100)]
Bump copyright years of files changed after 2019-01-01
Done via the following command:
git diff
1e6c102b --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
rinpatch [Sun, 1 Mar 2020 19:16:54 +0000 (19:16 +0000)]
Merge branch 'docs_cheatsheet' into 'develop'
DOCS Add warning for fetch_initial_posts + more explicit distinction between OTP and from source
See merge request pleroma/pleroma!2262
Ilja [Sun, 1 Mar 2020 19:16:54 +0000 (19:16 +0000)]
Add warning to the fetch_initial_posts setting. Now we sometimes have people who enable this without realising the consequences (tons of posts being fetcht as each fetch makes Pleroma discover new users)
I also made a more explicit distinction between OTP and from source installs in the general explanation
Alexander Strizhakov [Sun, 1 Mar 2020 09:48:49 +0000 (12:48 +0300)]
Merge branch 'develop' into gun
Alexander Strizhakov [Tue, 18 Feb 2020 15:10:39 +0000 (18:10 +0300)]
wait in mix task while pleroma is rebooted
Alexander Strizhakov [Fri, 17 Jan 2020 08:51:08 +0000 (11:51 +0300)]
spec fix
Alexander Strizhakov [Mon, 30 Dec 2019 09:35:41 +0000 (12:35 +0300)]
fix for compiling
Alexander Strizhakov [Mon, 30 Dec 2019 08:30:20 +0000 (11:30 +0300)]
ActivityPub actions & side-effects in transaction