Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/pip/google-api-python-client-2.…
Browse files Browse the repository at this point in the history
…156.0
  • Loading branch information
asmorodskyi authored Jan 23, 2025
2 parents 5dc955d + d44bd05 commit 98e6bfe
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96
with:
images: ${{ env.REGISTRY }}/${{ env.PCW_IMAGE_PREFIX }}_${{ matrix.suffix }}

Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96
with:
images: ${{ env.REGISTRY }}/${{ env.PCW_IMAGE_PREFIX }}_${{ matrix.suffix }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pcw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,4 @@ jobs:
- name: Run tests and collect coverage
run: pytest --cov
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
uses: codecov/codecov-action@v5
4 changes: 2 additions & 2 deletions ocw/templates/ocw/instance_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
{% block content %}
<link rel="stylesheet" href="{% static 'css/instance_table.css' %}">
{% if filter %}
<button data-toggle="collapse" class="btn btn-primary btn-sm" data-target="#table_filter">Edit filter<span class="glyphicon glyphicon-filter"></span></button>
<button data-bs-toggle="collapse" class="btn btn-primary btn-sm" data-bs-target="#table_filter">Edit filter<span class="glyphicon glyphicon-filter"></span></button>
Displaying {{ filter.qs.count }} of {{ filter.queryset.count }} items.
<div id="table_filter" class="well collapse {{ request.GET.state|yesno:"in, " }} ">
<div id="table_filter" class="card p-3 collapse {{ request.GET.state|yesno:"show, " }} ">
<form action="" method="get" class="form">
{% bootstrap_form filter.form %}
<a class="btn btn-default" role="button" href='{{ request.path }}' >Clear</a>
Expand Down

0 comments on commit 98e6bfe

Please sign in to comment.