Skip to content

Commit 6b9d599

Browse files
authored
Revert "Merge dev -> release/1.5-alpha (#128)"
This reverts commit 6f1053e.
1 parent 6f1053e commit 6b9d599

File tree

179 files changed

+3535
-3586
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+3535
-3586
lines changed

.github/workflows/lint-web.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ on:
1616

1717
jobs:
1818
lint-web:
19-
runs-on: [self-hosted, Linux, X64]
19+
runs-on: self-hosted
2020
steps:
2121
- uses: actions/checkout@v4
2222
- uses: actions/setup-node@v4
2323
with:
24-
node-version: 24
24+
node-version: 20
2525
- name: install deps
2626
working-directory: ./web
2727
run: |

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@
33
/*.local
44
.direnv/
55
.envrc
6-
/node_modules

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
[submodule "proto"]
22
path = proto
33
url = ../proto.git
4-
[submodule "web/src/shared/defguard-ui"]
5-
path = web/src/shared/defguard-ui
6-
url = [email protected]:DefGuard/ui.git

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:24-alpine AS web
1+
FROM node:22-alpine AS web
22

33
WORKDIR /app
44
COPY web/package.json .

package.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)