Skip to content
This repository has been archived by the owner on Dec 13, 2022. It is now read-only.

Commit

Permalink
Merge Hotfix security fixes 211008 into 21.10.x (#11494)
Browse files Browse the repository at this point in the history
* fix(conf) fix sql in escalation conf (#11251) (#11314)

* fix(conf) fix sql in escalation conf

* fix cs

* apply suggestion

* fix data display in escalations config pages

* fix escalation period save

* fix resources inheritance duplication

* Apply suggestion

* chore(install):update version to 21.10.8 + Update Jenkinsfile

* update Jenkinsfile

* Update Jenkinsfile

* enh(package): Change frontend-core by centreon-frontend

* fix tsconfig.json configuration with centreon-frontend

* fix bad path of tsconfig file in node_modules

* Revert unneeded changes to Jenkinsfile

Co-authored-by: alaunois <alaunois@centreon.com>
Co-authored-by: Jérémy Delpierre <jdelpierre@users.noreply.github.com>
  • Loading branch information
3 people authored Aug 3, 2022
1 parent 2d7f69a commit 1a6ee0e
Show file tree
Hide file tree
Showing 10 changed files with 2,843 additions and 557 deletions.
3 changes: 2 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ def stableBranch = "${serie}.x"
def devBranch = "dev-${serie}.x"
env.REF_BRANCH = stableBranch
env.PROJECT='centreon-web'
if (env.BRANCH_NAME.startsWith('release-')) {

if (env.BRANCH_NAME.startsWith("hotfix-") || env.BRANCH_NAME.startsWith("release-")) {
env.BUILD = 'RELEASE'
env.DELIVERY_STAGE = 'Delivery to testing'
env.DOCKER_STAGE = 'Docker packaging'
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/cypress/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../node_modules/@centreon/frontend-core/tsconfig/index",
"extends": "../node_modules/centreon-frontend/packages/frontend-config/tsconfig/index",
"compilerOptions": {
"baseUrl": "..",
"esModuleInterop": true,
Expand Down
Loading

0 comments on commit 1a6ee0e

Please sign in to comment.