Merge branch 'main' into dependabot/npm_and_yarn/follow-redirects-1.15.4

go-vela · Jan 31, 2024 · 37fe61f · 37fe61f
2 parents 4024ea7 + 6c2af08
commit 37fe61f
Show file tree

Hide file tree

Showing 14 changed files with 542 additions and 99 deletions.
diff --git a/.github/workflows/validate-pr-title.yml b/.github/workflows/validate-pr-title.yml
@@ -0,0 +1,17 @@
+# name of the action
+name: validate PR title
+
+# trigger on pull_request events of the opened & edited type.
+on:
+  pull_request:
+    types: [opened, synchronize, edited, reopened]
+
+# pipeline to execute
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: validate title
+        run: |
+          echo "${{ github.event.pull_request.title }}" | grep -Eq '^(feat|fix|chore|refactor|enhance|test|docs)(\(.*\)|):\s.+$' && (echo "Pass"; exit 0) || (echo "Incorrect Format. Please see https://go-vela.github.io/docs/community/contributing_guidelines/#development-workflow"; exit 1)
diff --git a/cypress/fixtures/repository.json b/cypress/fixtures/repository.json
@@ -36,6 +36,9 @@
     "comment": {
       "created": false,
       "edited": false
+    },
+    "schedule": {
+      "run": false
     }
   },
   "pipeline_type": "yaml",

diff --git a/cypress/fixtures/secret_org.json b/cypress/fixtures/secret_org.json
@@ -8,5 +8,27 @@
   "type": "org",
   "images": [],
   "events": ["push"],
+  "allow_events": {
+    "push": {
+      "branch": true,
+      "tag": false
+    },
+    "pull_request": {
+      "opened": false,
+      "synchronize": false,
+      "edited": false,
+      "reopened": false
+    },
+    "deployment": {
+      "created": false
+    },
+    "comment": {
+      "created": false,
+      "edited": false
+    },
+    "schedule": {
+      "run": true
+    }
+  },
   "allow_command": true
 }
diff --git a/cypress/fixtures/secret_repo.json b/cypress/fixtures/secret_repo.json
@@ -8,5 +8,27 @@
   "type": "repo",
   "images": [],
   "events": ["push"],
+  "allow_events": {
+    "push": {
+      "branch": true,
+      "tag": false
+    },
+    "pull_request": {
+      "opened": false,
+      "synchronize": false,
+      "edited": false,
+      "reopened": false
+    },
+    "deployment": {
+      "created": false
+    },
+    "comment": {
+      "created": false,
+      "edited": false
+    },
+    "schedule": {
+      "run": true
+    }
+  },
   "allow_command": true
 }
diff --git a/cypress/fixtures/secret_shared.json b/cypress/fixtures/secret_shared.json
@@ -8,5 +8,27 @@
   "type": "shared",
   "images": [],
   "events": ["push"],
+  "allow_events": {
+    "push": {
+      "branch": true,
+      "tag": false
+    },
+    "pull_request": {
+      "opened": false,
+      "synchronize": false,
+      "edited": false,
+      "reopened": false
+    },
+    "deployment": {
+      "created": false
+    },
+    "comment": {
+      "created": false,
+      "edited": false
+    },
+    "schedule": {
+      "run": true
+    }
+  },
   "allow_command": true
 }
diff --git a/cypress/fixtures/secrets_org_5.json b/cypress/fixtures/secrets_org_5.json
@@ -9,6 +9,28 @@
     "type": "org",
     "images": [],
     "events": ["push"],
+    "allow_events": {
+      "push": {
+        "branch": true,
+        "tag": false
+      },
+      "pull_request": {
+        "opened": false,
+        "synchronize": false,
+        "edited": false,
+        "reopened": false
+      },
+      "deployment": {
+        "created": false
+      },
+      "comment": {
+        "created": false,
+        "edited": false
+      },
+      "schedule": {
+        "run": true
+      }
+    },
     "allow_command": true
   },
   {
@@ -21,6 +43,28 @@
     "type": "org",
     "images": [],
     "events": ["push"],
+    "allow_events": {
+      "push": {
+        "branch": true,
+        "tag": false
+      },
+      "pull_request": {
+        "opened": false,
+        "synchronize": false,
+        "edited": false,
+        "reopened": false
+      },
+      "deployment": {
+        "created": false
+      },
+      "comment": {
+        "created": false,
+        "edited": false
+      },
+      "schedule": {
+        "run": true
+      }
+    },
     "allow_command": true
   },
   {
@@ -33,6 +77,28 @@
     "type": "org",
     "images": [],
     "events": ["push"],
+    "allow_events": {
+      "push": {
+        "branch": true,
+        "tag": false
+      },
+      "pull_request": {
+        "opened": false,
+        "synchronize": false,
+        "edited": false,
+        "reopened": false
+      },
+      "deployment": {
+        "created": false
+      },
+      "comment": {
+        "created": false,
+        "edited": false
+      },
+      "schedule": {
+        "run": true
+      }
+    },
     "allow_command": true
   },
   {
@@ -45,6 +111,28 @@
     "type": "org",
     "images": [],
     "events": ["push", "pull_request"],
+    "allow_events": {
+      "push": {
+        "branch": true,
+        "tag": false
+      },
+      "pull_request": {
+        "opened": false,
+        "synchronize": false,
+        "edited": false,
+        "reopened": false
+      },
+      "deployment": {
+        "created": false
+      },
+      "comment": {
+        "created": false,
+        "edited": false
+      },
+      "schedule": {
+        "run": true
+      }
+    },
     "allow_command": true
   },
   {
@@ -57,6 +145,28 @@
     "type": "org",
     "images": [],
     "events": ["push", "pull_request", "comment", "deployment"],
+    "allow_events": {
+      "push": {
+        "branch": true,
+        "tag": false
+      },
+      "pull_request": {
+        "opened": false,
+        "synchronize": false,
+        "edited": false,
+        "reopened": false
+      },
+      "deployment": {
+        "created": false
+      },
+      "comment": {
+        "created": false,
+        "edited": false
+      },
+      "schedule": {
+        "run": true
+      }
+    },
     "allow_command": true
   }
 ]
diff --git a/src/elm/Main.elm b/src/elm/Main.elm
@@ -64,7 +64,7 @@ import Html.Attributes
         , type_
         )
 import Html.Events exposing (onClick)
-import Html.Lazy exposing (lazy, lazy2, lazy3, lazy5, lazy7, lazy8)
+import Html.Lazy exposing (lazy, lazy2, lazy3, lazy4, lazy5, lazy7, lazy8)
 import Http
 import Http.Detailed
 import Interop
@@ -2974,7 +2974,7 @@ viewContent model =
         Pages.RepositoryDeployments org repo maybePage _ ->
             ( String.join "/" [ org, repo ] ++ " deployments" ++ Util.pageToString maybePage
             , div []
-                [ lazy3 Pages.Deployments.View.viewDeployments model.repo org repo
+                [ lazy4 Pages.Deployments.View.viewDeployments model.zone model.repo org repo
                 , Pager.view model.repo.deployments.pager Pager.defaultLabels GotoPage
                 ]
             )
@@ -3895,6 +3895,9 @@ loadRepoSubPage model org repo toPage =
                     Pages.RepoSettings o r ->
                         ( model, getRepo model o r )
 
+                    Pages.RepositoryDeployments o r maybePage maybePerPage ->
+                        ( model, getDeployments model o r maybePage maybePerPage )
+
                     Pages.PromoteDeployment o r deploymentNumber ->
                         ( model, getDeployment model o r deploymentNumber )