Merge feature/add_skin into master: resolve all conflicts
- GameGlobal.js: keep upstream SERVER_URL with /ws suffix - en.js/zh.js: merge both settings.nickname and settings.profile keys - SettingsScene.js: keep both nickname row and profile button - server/index.js: merge express app + content security proxy with noServer WebSocket mode and path validation - Add .gitignore for node_modules and .codebuddy
This commit is contained in:
@@ -0,0 +1,12 @@
|
||||
# ============================================================
|
||||
# Namespace: content-security
|
||||
# Independent namespace for content security service,
|
||||
# shared by multiple mini-games.
|
||||
# ============================================================
|
||||
apiVersion: v1
|
||||
kind: Namespace
|
||||
metadata:
|
||||
name: content-security
|
||||
labels:
|
||||
app.kubernetes.io/part-of: content-security
|
||||
app.kubernetes.io/managed-by: kubectl
|
||||
Reference in New Issue
Block a user