logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 4e37cd85ef5b1134913441166219f09220fd4942
parent 8e37f1988332e596a21ed3ce22b6c71564cd434b
Author: lain <lain@soykaf.club>
Date:   Tue, 19 Mar 2024 12:02:10 +0000

Merge branch 'fix-bookmark-test' into 'develop'

CI: Move changelog check to later in the pipeline

See merge request pleroma/pleroma!4095

Diffstat:

M.gitlab-ci.yml2+-
Achangelog.d/fix-bookmark-folder-tests.skip0
Rtest/pleroma/web/pleroma_api/controllers/bookmark_folder_controller_test.ex -> test/pleroma/web/pleroma_api/controllers/bookmark_folder_controller_test.exs0
3 files changed, 1 insertion(+), 1 deletion(-)

diff --git 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 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