From 4d9ecc2b9edf27b2e74416bb551d92415f5b8ba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Thu, 6 Oct 2022 00:11:25 +0200 Subject: [PATCH 1/3] Fix down() in AddUpdateToNotificationsEnum migration for Rebased MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- .../20220605185734_add_update_to_notifications_enum.exs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/priv/repo/migrations/20220605185734_add_update_to_notifications_enum.exs b/priv/repo/migrations/20220605185734_add_update_to_notifications_enum.exs index 0656c885f9..63be931f3d 100644 --- a/priv/repo/migrations/20220605185734_add_update_to_notifications_enum.exs +++ b/priv/repo/migrations/20220605185734_add_update_to_notifications_enum.exs @@ -10,7 +10,7 @@ def up do |> execute() end - # 20210717000000_add_poll_to_notifications_enum.exs + # 20220319000000_add_status_to_notifications_enum.exs def down do alter table(:notifications) do modify(:type, :string) @@ -37,7 +37,8 @@ def down do 'reblog', 'favourite', 'pleroma:report', - 'poll' + 'poll', + 'status' ) """ |> execute() From 23ab8e12b9f29244ebbad492799fcbb31620c8f9 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 9 Oct 2022 17:25:23 +0000 Subject: [PATCH 2/3] GitLab CI: tag `dind` --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11cb697cef..e7d967a6d4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -142,6 +142,8 @@ docker: cache: {} services: - docker:20.10.17-dind + tags: + - dind # https://medium.com/devops-with-valentine/how-to-build-a-docker-image-and-push-it-to-the-gitlab-container-registry-from-a-gitlab-ci-pipeline-acac0d1f26df script: - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin From 147f6c4f6340eb8d44a3b154140517cb16a58852 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Sun, 9 Oct 2022 13:37:27 -0500 Subject: [PATCH 3/3] Tag erratic Move tests --- .../mastodon_api/controllers/notification_controller_test.exs | 1 + test/pleroma/web/mastodon_api/views/notification_view_test.exs | 1 + 2 files changed, 2 insertions(+) diff --git a/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs index 57ef7e330f..1e2eeb535b 100644 --- a/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs +++ b/test/pleroma/web/mastodon_api/controllers/notification_controller_test.exs @@ -600,6 +600,7 @@ test "see notifications after muting user with notifications and with_muted para assert length(json_response_and_validate_schema(conn, 200)) == 1 end + @tag :erratic test "see move notifications" do old_user = insert(:user) new_user = insert(:user, also_known_as: [old_user.ap_id]) diff --git a/test/pleroma/web/mastodon_api/views/notification_view_test.exs b/test/pleroma/web/mastodon_api/views/notification_view_test.exs index d3d74f5cd3..772e1dcb38 100644 --- a/test/pleroma/web/mastodon_api/views/notification_view_test.exs +++ b/test/pleroma/web/mastodon_api/views/notification_view_test.exs @@ -144,6 +144,7 @@ test "Follow notification" do refute Repo.one(Notification) end + @tag :erratic test "Move notification" do old_user = insert(:user) new_user = insert(:user, also_known_as: [old_user.ap_id])