diff options
| author | lain <lain@soykaf.club> | 2024-03-19 12:02:10 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2024-03-19 12:02:10 +0000 |
| commit | 4e37cd85ef5b1134913441166219f09220fd4942 (patch) | |
| tree | 4b006de62983da826a8d01f158bfa4418a47d53a | |
| parent | 8e37f1988332e596a21ed3ce22b6c71564cd434b (diff) | |
| parent | 040a980277947ee2eb7ae8b7432a125536dc2f06 (diff) | |
| download | pleroma-4e37cd85ef5b1134913441166219f09220fd4942.tar.gz pleroma-4e37cd85ef5b1134913441166219f09220fd4942.zip | |
Merge branch 'fix-bookmark-test' into 'develop'
CI: Move changelog check to later in the pipeline
See merge request pleroma/pleroma!4095
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | changelog.d/fix-bookmark-folder-tests.skip | 0 | ||||
| -rw-r--r-- | test/pleroma/web/pleroma_api/controllers/bookmark_folder_controller_test.exs (renamed from test/pleroma/web/pleroma_api/controllers/bookmark_folder_controller_test.ex) | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79bb2fd7e..dab52e4c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,10 +26,10 @@ cache: &global_cache_policy - _build stages: - - check-changelog - build - lint - test + - check-changelog - benchmark - deploy - release diff --git a/changelog.d/fix-bookmark-folder-tests.skip b/changelog.d/fix-bookmark-folder-tests.skip new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/changelog.d/fix-bookmark-folder-tests.skip diff --git a/test/pleroma/web/pleroma_api/controllers/bookmark_folder_controller_test.ex b/test/pleroma/web/pleroma_api/controllers/bookmark_folder_controller_test.exs index 71b850859..71b850859 100644 --- a/test/pleroma/web/pleroma_api/controllers/bookmark_folder_controller_test.ex +++ b/test/pleroma/web/pleroma_api/controllers/bookmark_folder_controller_test.exs |