summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--changelog.d/fix-bookmark-folder-tests.skip0
-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