Alexander Strizhakov
1306b92997
clean up
2020-03-12 18:29:07 +03:00
Alexander Strizhakov
f39e1b9eff
add verify tls_opts only when we open connection
...
for other requests tesla will add tls_opts
2020-03-10 15:54:11 +03:00
Alexander Strizhakov
426f5ee48a
tesla adapter can't be changed in adminFE
2020-03-10 15:31:44 +03:00
Alexander Strizhakov
d9f8941dac
Merge branch 'develop' into gun
2020-03-09 10:56:33 +03:00
rinpatch
6cf1958b02
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
2020-03-07 17:00:58 +03:00
Alexander Strizhakov
474ef512df
wait in mix task while pleroma is rebooted
2020-03-07 16:02:55 +03:00
Alexander Strizhakov
b2eb1124d1
Merge branch 'develop' into gun
2020-03-07 12:41:37 +03:00
rinpatch
6d797b9928
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
...
Wait in mix task while pleroma is rebooted
See merge request pleroma/pleroma!2225
2020-03-07 09:32:29 +00:00
Alexander Strizhakov
5f42ecc4c7
start gun upload pool, if proxy_remote is enabled
2020-03-07 12:24:39 +03:00
Alexander Strizhakov
78282dc983
little polishing
2020-03-06 21:24:19 +03:00
Alexander Strizhakov
c93c3096d5
little refactor
2020-03-06 21:04:18 +03:00
Alexander Strizhakov
058c9b01ac
returning, not needed
2020-03-05 18:28:04 +03:00
Alexander Strizhakov
f0753eed0f
removing try block in tesla request
...
added mocks for tests which fail with Tesla.Mock.Error
2020-03-05 17:31:06 +03:00
lain
47604907c9
Merge branch 'proper_error_messages' into 'develop'
...
MastodonController: Return 404 errors correctly.
See merge request pleroma/pleroma!2270
2020-03-05 11:49:51 +00:00
Haelwenn
927079e2ff
Merge branch 'fix/stats-on-startup' into 'develop'
...
Generate instance stats on startup
Closes #1598
See merge request pleroma/pleroma!2271
2020-03-05 07:25:23 +00:00
Alexander Strizhakov
eb324467d9
removing try block in getting gun info
2020-03-05 09:51:52 +03:00
Mark Felder
cdb05633a6
Generate instance stats on startup
2020-03-04 13:33:26 -06:00
feld
9b740cfb23
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
2020-03-04 18:22:37 +00:00
lain
4bce13fa2f
MastodonController: Return 404 errors correctly.
2020-03-04 18:09:06 +01:00
Alexander Strizhakov
d6bebd4f9c
moving some logic to tesla adapter
...
- checking original inside gun adapter
- flushing streams on max_body error
2020-03-04 18:13:24 +03:00
lain
6f7a8c43a2
Merge branch 'fix/no-email-no-fail' into 'develop'
...
Do not fail when user has no email
See merge request pleroma/pleroma!2249
2020-03-04 12:43:06 +00:00
Alexander Strizhakov
22d52f5691
same copyright date format
2020-03-04 09:41:23 +03:00
Alexander Strizhakov
6b2fb9160c
otp version
2020-03-04 09:23:42 +03:00
Mark Felder
d9c5ae7c09
Update Copyrights for gun related files
2020-03-03 17:16:24 -06:00
Mark Felder
4427161ca3
Merge branch 'develop' into gun
2020-03-03 17:15:49 -06:00
Mark Felder
05da5f5cca
Update Copyrights
2020-03-03 16:44:49 -06:00
Alexander Strizhakov
884d9710b2
refactoring for gun api modules
2020-03-03 19:24:14 +03:00
Alexander Strizhakov
f98ee730f0
adapter renaming to adapter_helper
2020-03-03 18:53:44 +03:00
Alexander Strizhakov
8854770fc4
retry and retry_timeout settings default change
2020-03-03 18:01:35 +03:00
Alexander Strizhakov
1ad34bfdba
no try block in checkout connection
2020-03-03 17:44:04 +03:00
Alexander Strizhakov
24bf5c4e89
remove try block from pool request
2020-03-03 17:27:56 +03:00
Alexander Strizhakov
aaa879ce75
proxy parsing errors
2020-03-03 17:27:22 +03:00
Alexander Strizhakov
6ebf389d6e
poolboy timeout fix
2020-03-03 16:51:49 +03:00
Alexander Strizhakov
8fc00b7cbf
return error if connection failed to open
2020-03-03 16:42:24 +03:00
Alexander Strizhakov
7d68924e4f
naming
2020-03-03 16:42:24 +03:00
Alexander Strizhakov
e605e79df9
simplification of formatting host method
...
case for format_proxy method
2020-03-03 16:42:03 +03:00
Alexander Strizhakov
ee8071f0d5
removing unused method
2020-03-03 15:12:09 +03:00
Alexander Strizhakov
05429730e4
unnecessary with
2020-03-03 15:11:48 +03:00
Alexander Strizhakov
d0e4d3ca3b
removing unnecessary with
...
comment in tesla client impovement
2020-03-03 14:56:49 +03:00
Alexander Strizhakov
24d1ac125c
hiding raise error logic to otp_version module
2020-03-03 13:24:19 +03:00
Alexander Strizhakov
28ed4b41d0
naming for checkin from pool timeout
2020-03-03 13:05:28 +03:00
Alexander Strizhakov
151dc4e387
Apply suggestion to lib/pleroma/reverse_proxy/client/tesla.ex
2020-03-03 09:53:37 +00:00
Alexander Strizhakov
7eb6592992
Apply suggestion to lib/pleroma/pool/connections.ex
2020-03-03 09:53:31 +00:00
Alexander Strizhakov
a21a66972f
Apply suggestion to lib/pleroma/http/http.ex
2020-03-03 09:52:01 +00:00
Alexander Strizhakov
614e3934f9
Apply suggestion to lib/pleroma/http/http.ex
2020-03-03 09:50:42 +00:00
Alexander Strizhakov
d30ff35d94
Apply suggestion to lib/pleroma/http/request_builder.ex
2020-03-03 09:46:53 +00:00
Alexander Strizhakov
a3ad028973
Apply suggestion to lib/pleroma/http/adapter.ex
2020-03-03 09:34:36 +00:00
Alexander Strizhakov
2c8d80dc0a
Apply suggestion to lib/pleroma/pool/connections.ex
2020-03-03 09:29:57 +00:00
Alexander Strizhakov
097ad10d02
Apply suggestion to lib/pleroma/pool/connections.ex
2020-03-03 09:29:51 +00:00
Alexander Strizhakov
4c8569d403
otp_version refactor
2020-03-03 12:21:10 +03:00
