projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6706cdc
fbe3d3a
)
Merge branch 'fix/1742-random-failing-tests' into 'develop'
author
lain
<lain@soykaf.club>
Wed, 13 May 2020 13:38:32 +0000
(13:38 +0000)
committer
lain
<lain@soykaf.club>
Wed, 13 May 2020 13:38:32 +0000
(13:38 +0000)
Fix sporadically failing tests
See merge request pleroma/pleroma!2524
1
2
test/activity_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/admin_api/admin_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/feed/tag_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/mastodon_api/controllers/search_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
test/web/push/impl_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
test/activity_test.exs
Simple merge
diff --cc
test/web/admin_api/admin_api_controller_test.exs
Simple merge
diff --cc
test/web/feed/tag_controller_test.exs
Simple merge
diff --cc
test/web/mastodon_api/controllers/search_controller_test.exs
Simple merge
diff --cc
test/web/push/impl_test.exs
Simple merge
projects / akkoma / commitdiff