Merge branch 'implement-silence-list-modal' of github.com:bai1024/pro…

…mgen into implement-silence-list-modal # Conflicts: # promgen/static/js/promgen.vue.js
line · Sep 10, 2024 · b53a2b8 · b53a2b8
2 parents 11554d7 + 236aa46
commit b53a2b8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml
@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - uses: actions/[email protected]
-      - uses: actions/setup-python@v5.1.1
+      - uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip

diff --git a/.github/workflows/sphinx.yml b/.github/workflows/sphinx.yml
@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - uses: actions/[email protected]
-      - uses: actions/setup-python@v5.1.1
+      - uses: actions/setup-python@v5.2.0
         with:
           python-version: ${{ matrix.python-version }}
           cache: pip

diff --git a/promgen/static/js/promgen.vue.js b/promgen/static/js/promgen.vue.js
@@ -376,7 +376,7 @@ app.component('silence-list-modal', {
             }
 
             return this.activeSilences.filter(silence => {
-                return this.state.labels.some(filterLabel => {
+                return this.state.labels.every(filterLabel => {
                     return silence.matchers.some(matcher => 
                         matcher.name === filterLabel.label &&
                         matcher.value === filterLabel.value