Merge branch 'main' into feat-bazaar-item-tier

Galarzaa90 · web-flow · commit e2de6579c61e · 2023-02-17T15:46:27.000-07:00
diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml
@@ -2,7 +2,7 @@ name: Analyze
 on:
   push:
     branches:
-      - master
+      - main
       - dev
   pull_request:
     types: [opened, synchronize, reopened]
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -2,11 +2,11 @@ name: Coverage Report
 on:
   push:
     branches:
-      - master
+      - main
       - dev
   pull_request:
     branches:
-      - master
+      - main
       - dev
 
 jobs:
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -3,7 +3,6 @@ name: Docker Build
 on:
   push:
     branches:
-      - master
       - dev
       - main
     tags:
diff --git a/.github/workflows/pages_deploy.yml b/.github/workflows/pages_deploy.yml
@@ -2,7 +2,7 @@ name: Publish docs via GitHub Pages
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   build:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -75,5 +75,5 @@ pages:
     paths:
       - public
   only:
-    - master
+    - main
     - dev

-Original file line number
+Diff line change
 on:
   push:
     branches:
 -      - master
       - dev
       - main
     tags: