Skip to content

Commit e090ee6

Browse files
profd2004profd2004
committed
Merge branch 'dev' into 'main'
fix(GitLab sync): update GitLab remote URLs to the correct domain See merge request voltaire/govtool-outcomes-pillar!81
2 parents d931fab + d1a4293 commit e090ee6

File tree

3 files changed

+40
-15
lines changed

3 files changed

+40
-15
lines changed

‎.github/workflows/gitlab-tags-releases-sync.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
2828
- name: Add GitLab remote
2929
run: |
30-
git remote add gitlab "https://oauth2:${GITLAB_TOKEN}@gitlab.lidonation.com/voltaire/govtool-outcomes-pillar.git"
30+
git remote add gitlab "https://oauth2:${GITLAB_TOKEN}@gitlab.2lovelaces.io/voltaire/govtool-outcomes-pillar.git"
3131
env:
3232
GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
3333

@@ -56,7 +56,7 @@ jobs:
5656
RELEASE_DESC="${{ github.event.release.body }}"
5757
5858
# Create/Update release in GitLab using API
59-
curl --request POST "https://gitlab.lidonation.com/api/v4/projects/${GITLAB_PROJECT_ID}/releases" \
59+
curl --request POST "https://gitlab.2lovelaces.io/api/v4/projects/${GITLAB_PROJECT_ID}/releases" \
6060
--header "PRIVATE-TOKEN: ${GITLAB_TOKEN}" \
6161
--header "Content-Type: application/json" \
6262
--data "{
@@ -66,7 +66,7 @@ jobs:
6666
}"
6767
elif [[ "${{ github.event.action }}" == "deleted" ]]; then
6868
# Delete release in GitLab
69-
curl --request DELETE "https://gitlab.lidonation.com/api/v4/projects/${GITLAB_PROJECT_ID}/releases/${{ github.event.release.tag_name }}" \
69+
curl --request DELETE "https://gitlab.2lovelaces.io/api/v4/projects/${GITLAB_PROJECT_ID}/releases/${{ github.event.release.tag_name }}" \
7070
--header "PRIVATE-TOKEN: ${GITLAB_TOKEN}"
7171
fi
7272
env:

‎ui/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,27 +57,27 @@
5757
"react-markdown": "^9.0.3",
5858
"react-query": "^3.39.3",
5959
"react-router-dom": "^6.23.1",
60+
"remark-breaks": "^4.0.0",
61+
"remark-gfm": "^4.0.1",
6062
"rollup": "^4.28.0",
6163
"rollup-plugin-dts": "^6.1.1",
6264
"rollup-plugin-peer-deps-external": "^2.2.4",
6365
"rollup-plugin-postcss": "^4.0.2",
6466
"sass": "^1.77.2",
6567
"semantic-release": "^24.2.1",
6668
"tslib": "^2.8.1",
67-
"remark-gfm": "^4.0.1",
68-
"remark-breaks": "^4.0.0",
6969
"typescript": "^5.7.2"
7070
},
7171
"dependencies": {
7272
"@fontsource/poppins": "^5.0.14",
7373
"@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8",
74-
"axios": "^1.10.0",
74+
"axios": "^1.12.2",
7575
"bech32": "^2.0.0",
7676
"buffer": "^6.0.3",
7777
"react-diff-view": "^3.2.1",
78-
"unidiff": "^1.0.4",
7978
"rehype-katex": "^7.0.1",
80-
"remark-math": "^6.0.0"
79+
"remark-math": "^6.0.0",
80+
"unidiff": "^1.0.4"
8181
},
8282
"peerDependencies": {
8383
"@emotion/react": "^11.11.4",

‎ui/yarn.lock‎

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2123,10 +2123,10 @@ autoprefixer@^10.4.20:
21232123
picocolors "^1.0.1"
21242124
postcss-value-parser "^4.2.0"
21252125

2126-
axios@^1.10.0:
2127-
version "1.11.0"
2128-
resolved "https://registry.yarnpkg.com/axios/-/axios-1.11.0.tgz#c2ec219e35e414c025b2095e8b8280278478fdb6"
2129-
integrity sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==
2126+
axios@^1.12.2:
2127+
version "1.12.2"
2128+
resolved "https://registry.yarnpkg.com/axios/-/axios-1.12.2.tgz#6c307390136cf7a2278d09cec63b136dfc6e6da7"
2129+
integrity sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==
21302130
dependencies:
21312131
follow-redirects "^1.15.6"
21322132
form-data "^4.0.4"
@@ -6600,7 +6600,16 @@ string-hash@^1.1.1:
66006600
resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b"
66016601
integrity sha512-kJUvRUFK49aub+a7T1nNE66EJbZBMnBgoC1UbCZ5n6bsZKBRga4KgBRTMn/pFkeCZSYtNeSyMxPDM0AXWELk2A==
66026602

6603-
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
6603+
"string-width-cjs@npm:string-width@^4.2.0":
6604+
version "4.2.3"
6605+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
6606+
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
6607+
dependencies:
6608+
emoji-regex "^8.0.0"
6609+
is-fullwidth-code-point "^3.0.0"
6610+
strip-ansi "^6.0.1"
6611+
6612+
string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
66046613
version "4.2.3"
66056614
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
66066615
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -6633,7 +6642,14 @@ stringify-entities@^4.0.0:
66336642
character-entities-html4 "^2.0.0"
66346643
character-entities-legacy "^3.0.0"
66356644

6636-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
6645+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
6646+
version "6.0.1"
6647+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
6648+
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
6649+
dependencies:
6650+
ansi-regex "^5.0.1"
6651+
6652+
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
66376653
version "6.0.1"
66386654
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
66396655
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -7146,7 +7162,16 @@ wordwrap@^1.0.0:
71467162
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
71477163
integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
71487164

7149-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
7165+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
7166+
version "7.0.0"
7167+
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
7168+
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
7169+
dependencies:
7170+
ansi-styles "^4.0.0"
7171+
string-width "^4.1.0"
7172+
strip-ansi "^6.0.0"
7173+
7174+
wrap-ansi@^7.0.0:
71507175
version "7.0.0"
71517176
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
71527177
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

0 commit comments

Comments
 (0)