From 03fa7b550e4ac471e84b3950c56dfe9e8da63816 Mon Sep 17 00:00:00 2001
From: ArmandBahi <armand.bahi@veremes.com>
Date: Mon, 11 Apr 2022 17:05:58 +0200
Subject: [PATCH] Correction merge
---
_install/dependencies.json | 4 ++--
_install/templates/properties.json | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/_install/dependencies.json b/_install/dependencies.json
index d5e35660..ee090548 100644
--- a/_install/dependencies.json
+++ b/_install/dependencies.json
@@ -40,12 +40,12 @@
}
},
"framework": {
- "branch": "master",
+ "branch": "next_app_vmap",
"name": "vitis",
"url": "git@gitlab.veremes.net:Development/vitis-2020/sources/vitis.git"
},
"modules": [{
- "branch": "master",
+ "branch": "next_version",
"name": "module_vmap",
"url": "git@gitlab.veremes.net:Development/vitis-2020/sources/module_vmap.git"
}]
diff --git a/_install/templates/properties.json b/_install/templates/properties.json
index f49dfe1f..cec38944 100644
--- a/_install/templates/properties.json
+++ b/_install/templates/properties.json
@@ -1,5 +1,6 @@
{
{% if not client_properties_exists %}
+ "status": "stable",
"application": "{{application.name}}",
"default_show_sidenav": true,
"widget_public_connect_available": true,
@@ -18,6 +19,5 @@
"proxy_url": "https://[hostname]{{API_ALIAS}}/v2/proxy/proxy",
"version": "{{application.branch}}",
"build": "{{APP_BUILD}}",
- "month_year": "{{MONTH_YEAR}}",
- "status": "stable"
+ "month_year": "{{MONTH_YEAR}}"
}
--
GitLab