Change CI trigger rule with branch name OR merge request event

Closes #98 (closed)

It should work, I commented the "manual" keyword

.gitlab-ci.yml

@@ -14,8 +14,7 @@ cache:
 
 workflow:
   rules:
-    - if: $CI_COMMIT_REF_NAME == "98-new-ci-rule-skipped-pypi-step" || $CI_COMMIT_REF_NAME == "develop" || $CI_COMMIT_REF_NAME == "master"
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME == "develop" || $CI_PIPELINE_SOURCE == "merge_request_event"
 
 stages:
   - Static Analysis
@@ -100,7 +99,10 @@ test_pipeline:
 
 docs:
   stage: Ship
-  when: manual
+  #when: manual
+  only:
+    - master
+    - develop
   before_script:
     - apt update && apt install -y python3.8-venv
     - python3 -m venv docs_venv
@@ -115,9 +117,8 @@ docs:
 
 pypi:
   stage: Ship
-  when: manual
+  #when: manual
   only:
-    - 98-new-ci-rule-skipped-pypi-step
     - master
     - develop