From c03ead547028e8965e10820a535f5940527e9b64 Mon Sep 17 00:00:00 2001
From: proletarius101 <proletarius101@protonmail.com>
Date: Mon, 31 Oct 2022 21:37:08 +0000
Subject: [PATCH] switch to merge request pipelines

---
 .gitlab-ci.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f742946447..a1c45e0f33 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,13 @@
 include:
   - template: Security/SAST.gitlab-ci.yml
-  # Use branch pipelines to avoid Premium tier features
-  - template: Workflows/Branch-Pipelines.gitlab-ci.yml
+  
+# copied from https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Workflows/MergeRequest-Pipelines.gitlab-ci.yml
+workflow:
+  rules:
+    # required to enable merge request pipelines: https://docs.gitlab.com/ee/ci/pipelines/merge_request_pipelines.html#prerequisites
+    - if: $CI_MERGE_REQUEST_IID
+    - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH
 
 stages:
   - prepare