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
|
9f884a2639
|
tests changes
|
2020-03-07 11:01:37 +03:00 |
|
Alexander Strizhakov
|
14678a7708
|
using `stub` instead `expect`
|
2020-03-07 10:12:34 +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
|
56ff02f2ef
|
removing GunMock to use Mox
|
2020-03-06 20:23:58 +03:00 |
feld
|
46f118d7e1
|
Merge branch 'revert-67cc4dce' into 'develop'
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"
See merge request pleroma/pleroma!2276
|
2020-03-06 16:03:24 +00:00 |
|
feld
|
15d36b7f5f
|
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"
This reverts merge request !2274
|
2020-03-06 15:56:41 +00:00 |
lain
|
67cc4dceb5
|
Merge branch 'update/admin-fe-without-emojipack' into 'develop'
Remove emoji support from AdminFE
See merge request pleroma/pleroma!2274
|
2020-03-06 15:14:10 +00:00 |
Mark Felder
|
d283c9abc1
|
Remove emoji support from AdminFE
|
2020-03-06 07:53:33 -06:00 |
|
Alexander Strizhakov
|
931111fd55
|
removing integration tests
|
2020-03-05 18:57:45 +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 |
|
lain
|
f1750b4658
|
Admin API tests: Fix wrong test.
|
2020-03-05 12:42:02 +01: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
|
ec3dc462ff
|
Document the instance stats fix
|
2020-03-04 13:41:04 -06: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 |
|
Alexander Strizhakov
|
b34bc669b9
|
adding descriptions
|
2020-03-04 20:09:18 +03:00 |
|
lain
|
4bce13fa2f
|
MastodonController: Return 404 errors correctly.
|
2020-03-04 18:09:06 +01:00 |
|
Alexander Strizhakov
|
fe47bcde8c
|
updating tesla ref
|
2020-03-04 19:44:03 +03: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 |
|
Alexander Strizhakov
|
8d9dee1ba9
|
retry_timeout description change
|
2020-03-04 08:56:36 +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 |
|
Haelwenn
|
5992c256ad
|
Merge branch 'chore/update-copyrights' into 'develop'
Update Copyrights
See merge request pleroma/pleroma!2269
|
2020-03-03 23:15:12 +00:00 |
|
Mark Felder
|
5592db4757
|
Older copyright updates
|
2020-03-03 16:46:45 -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
|
23f407bf09
|
don't test gun itself
|
2020-03-03 18:57:16 +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
|
3723d72365
|
proxy parse tests fix
|
2020-03-03 17:32:59 +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
|
7c0ed9302c
|
unnecessary mock
|
2020-03-03 16:46:20 +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 |