Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into fix/ts-checks
Browse files Browse the repository at this point in the history
# Conflicts:
#	frontend/src/components/Topics/Topic/Messages/Filters/Filters.tsx
  • Loading branch information
Haarolean committed Mar 1, 2024
2 parents 9d439a5 + 3608b26 commit f05197c
Show file tree
Hide file tree
Showing 51 changed files with 510 additions and 345 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/aws_publisher.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
jobs:
build-ami:
name: Build AMI
runs-on: gha-private-runner
runs-on: ubuntu-latest
steps:
- name: Clone infra repo
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backend_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ permissions:

jobs:
build-and-test:
runs-on: gha-private-runner
runs-on: ubuntu-latest
steps:

- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/block_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
types: [opened, labeled, unlabeled, synchronize]
jobs:
block_merge:
runs-on: gha-private-runner
runs-on: ubuntu-latest
steps:
- uses: mheap/github-action-required-labels@v5
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/branch-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:
jobs:
build:
if: ${{ github.event.label.name == 'status/feature_testing' || github.event.label.name == 'status/feature_testing_public' }}
runs-on: gha-private-runner
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
tag: ${{ steps.extract_branch.outputs.tag }}
make-branch-env:
needs: build
runs-on: gha-private-runner
runs-on: ubuntu-latest
steps:
- name: clone
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/branch-remove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:

jobs:
remove:
runs-on: gha-private-runner
runs-on: ubuntu-latest
if: ${{ (github.event.label.name == 'status/feature_testing' || github.event.label.name == 'status/feature_testing_public') || (github.event.action == 'closed' && (contains(github.event.pull_request.labels.*.name, 'status/feature_testing') || contains(github.event.pull_request.labels.*.name, 'status/feature_testing_public'))) }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-public-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions:
jobs:
build:
if: ${{ github.event.label.name == 'status/image_testing' }}
runs-on: gha-private-runner
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ permissions:
jobs:
analyze:
name: Analyze
runs-on: gha-private-runner
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cve.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:

jobs:
build-and-test:
runs-on: gha-private-runner
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/delete-public-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
remove:
if: ${{ github.event.label.name == 'status/image_testing' || ( github.event.action == 'closed' && (contains(github.event.pull_request.labels, 'status/image_testing'))) }}
runs-on: gha-private-runner
runs-on: ubuntu-latest
steps:
- name: get branch name
id: extract_branch
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ permissions:

jobs:
build-and-test:
runs-on: gha-private-runner
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-manual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ permissions:

jobs:
build-and-test:
runs-on: gha-private-runner
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ permissions:

jobs:
build-and-test:
runs-on: gha-private-runner
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ permissions:

jobs:
build-and-test:
runs-on: gha-private-runner
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
env:
CI: true
NODE_ENV: dev
runs-on: gha-private-runner
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:

jobs:
build:
runs-on: gha-private-runner
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/md-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ permissions:

jobs:
build-and-test:
runs-on: gha-private-runner
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ permissions:
checks: write
jobs:
task-check:
runs-on: gha-private-runner
runs-on: ubuntu-latest
steps:
- uses: kentaro-m/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-serde-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ permissions:

jobs:
release-serde-api:
runs-on: gha-private-runner
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ permissions:

jobs:
release:
runs-on: gha-private-runner
runs-on: ubuntu-latest
permissions:
contents: write
packages: write
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
cache-to: type=local,dest=/tmp/.buildx-cache

charts:
runs-on: gha-private-runner
runs-on: ubuntu-latest
needs: release
steps:
- name: Repository Dispatch
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ permissions:

jobs:
update_release_draft:
runs-on: gha-private-runner
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/separate_env_public_create.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:

jobs:
build:
runs-on: gha-private-runner
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
tag: ${{ steps.extract_branch.outputs.tag }}

separate-env-create:
runs-on: gha-private-runner
runs-on: ubuntu-latest
needs: build
steps:
- name: clone
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/separate_env_public_remove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
separate-env-remove:
runs-on: gha-private-runner
runs-on: ubuntu-latest
steps:
- name: clone
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/welcome-first-time-contributors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:
pull-requests: write
jobs:
welcome:
runs-on: gha-private-runner
runs-on: ubuntu-latest
steps:
- uses: actions/first-interaction@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workflow_linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ permissions:

jobs:
build-and-test:
runs-on: gha-private-runner
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
Expand Down
3 changes: 1 addition & 2 deletions frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />

<!-- Favicons -->
<link rel="icon" href="<%= PUBLIC_PATH %>/favicon/favicon.ico" sizes="any" />
<link rel="icon" href="<%= PUBLIC_PATH %>/favicon/icon.svg" type="image/svg+xml" />
<link rel="icon" href="<%= PUBLIC_PATH %>/favicon/favicon.svg" type="image/svg+xml" />
<link rel="apple-touch-icon" href="<%= PUBLIC_PATH %>/favicon/apple-touch-icon.png" />
<link rel="manifest" href="<%= PUBLIC_PATH %>/manifest.json" />

Expand Down
Binary file removed frontend/public/favicon/favicon.ico
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion frontend/src/components/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const App: React.FC = () => {
<QueryClientProvider client={queryClient}>
<GlobalSettingsProvider>
<ThemeProvider theme={isDarkMode ? darkTheme : theme}>
<Suspense fallback={<PageLoader />}>
<Suspense fallback={<PageLoader fullSize />}>
<UserInfoRolesAccessProvider>
<ConfirmContextProvider>
<GlobalCSS />
Expand Down
Loading

0 comments on commit f05197c

Please sign in to comment.