Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/NodeBB/NodeBB into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
barisusakli committed May 15, 2024
2 parents 135962d + 7a8116a commit fb53bbc
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Cache node_modules
id: cache-node-modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: var-cache-node-modules
key: var-cache-node-modules-${{ hashFiles('Dockerfile', 'install/package.json') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
- 5432:5432

redis:
image: 'redis:7.2.3'
image: 'redis:7.2.4'
# Set health checks to wait until redis has started
options: >-
--health-cmd "redis-cli ping"
Expand Down
4 changes: 2 additions & 2 deletions docker-compose-pgsql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
- ./install/docker/setup.json:/usr/src/app/setup.json

postgres:
image: postgres:16.1-alpine
image: postgres:16.3-alpine
restart: unless-stopped
environment:
POSTGRES_USER: nodebb
Expand All @@ -24,7 +24,7 @@ services:
- postgres-data:/var/lib/postgresql/data

redis:
image: redis:7.2.3-alpine
image: redis:7.2.4-alpine
restart: unless-stopped
command: ['redis-server', '--appendonly', 'yes', '--loglevel', 'warning']
# command: ["redis-server", "--save", "60", "1", "--loglevel", "warning"] # uncomment if you want to use snapshotting instead of AOF
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-redis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
- ./install/docker/setup.json:/usr/src/app/setup.json

redis:
image: redis:7.2.3-alpine
image: redis:7.2.4-alpine
restart: unless-stopped
command: ['redis-server', '--appendonly', 'yes', '--loglevel', 'warning']
# command: ["redis-server", "--save", "60", "1", "--loglevel", "warning"] # uncomment if you want to use snapshotting instead of AOF
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ services:
- mongo-data:/data/db
- ./install/docker/mongodb-user-init.js:/docker-entrypoint-initdb.d/user-init.js
redis:
image: redis:7.2.3-alpine
image: redis:7.2.4-alpine
restart: unless-stopped
command: ['redis-server', '--appendonly', 'yes', '--loglevel', 'warning']
# command: ['redis-server', '--save', '60', '1', '--loglevel', 'warning'] # uncomment if you want to use snapshotting instead of AOF
Expand Down
6 changes: 3 additions & 3 deletions install/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@fortawesome/fontawesome-free": "6.5.2",
"@isaacs/ttlcache": "1.4.1",
"@popperjs/core": "2.11.8",
"ace-builds": "1.33.1",
"ace-builds": "1.33.2",
"archiver": "7.0.1",
"async": "3.2.5",
"autoprefixer": "10.4.19",
Expand Down Expand Up @@ -63,7 +63,7 @@
"csrf-sync": "4.0.3",
"daemon": "1.1.0",
"diff": "5.2.0",
"esbuild": "0.21.1",
"esbuild": "0.21.2",
"express": "4.19.2",
"express-session": "1.18.0",
"express-useragent": "1.0.15",
Expand Down Expand Up @@ -120,7 +120,7 @@
"progress-webpack-plugin": "1.0.16",
"prompt": "1.3.0",
"ioredis": "5.4.1",
"rimraf": "5.0.6",
"rimraf": "5.0.7",
"rss": "1.2.2",
"rtlcss": "4.1.1",
"sanitize-html": "2.13.0",
Expand Down
2 changes: 1 addition & 1 deletion public/language/th/admin/dashboard.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"restart-warning": "การสร้างหรือเริ่มต้นระบบ NodeBB ของคุณจะทำให้การเชื่อมต่อถูกตัดเป็นเวลาหลายวินาที",
"restart-disabled": "การสร้างและเริ่มต้นระบบ NodeBB ของคุณไม่เปิดให้ใช้งาน เนื่องจากคุณไม่ได้เรียกใช้จาก daemon ที่ถูกต้อง",
"maintenance-mode": "โหมดการซ่อมบำรุง",
"maintenance-mode-title": "Click here to set up maintenance mode for NodeBB",
"maintenance-mode-title": "คลิกที่นี่เพื่อเข้าสู่โหมดการซ่อมบำรุงของ NodeBB",
"dark-mode": "โหมดมืด",
"realtime-chart-updates": "Realtime Chart Updates",

Expand Down

0 comments on commit fb53bbc

Please sign in to comment.