Skip to content

Commit ae99a32

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/ui-tests/pdfjs-dist-5.5.207
2 parents 6153122 + 74f5604 commit ae99a32

16 files changed

Lines changed: 830 additions & 615 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ jobs:
4848
uses: actions/checkout@v6
4949

5050
- name: Log in to Docker Hub
51-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef
51+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9
5252
with:
5353
username: ${{ secrets.DOCKERHUB_USERNAME }}
5454
password: ${{ secrets.DOCKERHUB_TOKEN }}
5555

5656
- name: Build and push Docker image
57-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
57+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
5858
with:
5959
push: true
6060
file: ./Dockerfile-core

.github/workflows/docker-image.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626
echo ${{ steps.vars.outputs.tag }}
2727
2828
- name: Log in to Docker Hub
29-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef
29+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9
3030
with:
3131
username: ${{ secrets.DOCKERHUB_USERNAME }}
3232
password: ${{ secrets.DOCKERHUB_TOKEN }}
3333

3434
- name: Build and push Docker image
35-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
35+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
3636
with:
3737
context: .
3838
push: true
@@ -57,13 +57,13 @@ jobs:
5757
echo ${{ steps.vars.outputs.tag }}
5858
5959
- name: Log in to Docker Hub
60-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef
60+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9
6161
with:
6262
username: ${{ secrets.DOCKERHUB_USERNAME }}
6363
password: ${{ secrets.DOCKERHUB_TOKEN }}
6464

6565
- name: Build and push Docker image
66-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
66+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
6767
with:
6868
push: true
6969
file: ./Dockerfile-api
@@ -88,13 +88,13 @@ jobs:
8888
echo ${{ steps.vars.outputs.tag }}
8989
9090
- name: Log in to Docker Hub
91-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef
91+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9
9292
with:
9393
username: ${{ secrets.DOCKERHUB_USERNAME }}
9494
password: ${{ secrets.DOCKERHUB_TOKEN }}
9595

9696
- name: Build and push Docker image
97-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
97+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
9898
with:
9999
push: true
100100
file: ./Dockerfile-frontend
@@ -119,13 +119,13 @@ jobs:
119119
echo ${{ steps.vars.outputs.tag }}
120120
121121
- name: Log in to Docker Hub
122-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef
122+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9
123123
with:
124124
username: ${{ secrets.DOCKERHUB_USERNAME }}
125125
password: ${{ secrets.DOCKERHUB_TOKEN }}
126126

127127
- name: Build and push Docker image
128-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
128+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8
129129
with:
130130
push: true
131131
file: ./Dockerfile-core

CHANGELOG.md

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,28 @@
1-
## Version 25.03.X
1+
## Version 25.03.37
22
Fixes:
33
- [core] Update home page download notification text
4+
- [data-manager] Add search and checkboxes in event selector when creating event group
5+
6+
Enterprise fixes:
7+
- [funnels] Use lsid in same session funnel calculation
8+
- [users] Export drill data on user export
9+
- [users] Fix export query when there is profile group filter
10+
11+
Dependencies:
12+
- Bump @faker-js/faker from 10.2.0 to 10.3.0 in /ui-tests
13+
- Bump axios from 1.13.2 to 1.13.5
14+
- Bump basic-ftp from 5.1.0 to 5.2.0
15+
- Bump cypress from 15.10.0 to 15.11.0 in /ui-tests
16+
- Bump fast-xml-parser and @google-cloud/storage in /plugins/push
17+
- Bump geoip-lite from 1.4.10 to 2.0.0
18+
- Bump minimatch from 9.0.5 to 9.0.9 in /api/utils/countly-request
19+
- Bump minimatch from 9.0.5 to 9.0.9 in /plugins/hooks
20+
- Bump nodemailer from 7.0.13 to 8.0.1
21+
- Bump qs from 6.14.1 to 6.14.2
22+
- Bump rollup from 4.56.0 to 4.59.0 in /plugins/journey_engine
23+
- Bump swiper from 12.0.3 to 12.1.2 in /plugins/content
24+
- Bump systeminformation from 5.30.5 to 5.31.1 in /ui-tests
25+
- Bump tar-stream from 3.1.7 to 3.1.8 in /plugins/system-utility
426

527
## Version 25.03.36
628
Enterprise fixes:

0 commit comments

Comments
 (0)