Merge pull request #407 from jhipster/upgrade-jdlstudio

Upgrade jdl studio
jhipster · Aug 24, 2023 · 764ee45 · 764ee45
2 parents c2754fc + 63c98ea
commit 764ee45
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -111,7 +111,7 @@
     "webapp:dev-verbose": "ng serve --verbose",
     "webapp:prod": "yarn run clean-www && yarn run webapp:build:prod",
     "webapp:test": "yarn run test",
-    "update-jdl-studio": "cd src/main/resources/static/jdl-studio && git pull origin gh-pages && cd .. && git add jdl-studio && git commit -m 'jdl-studio submodule updated'"
+    "update-jdl-studio": "cd src/main/resources/static/jdl-studio && git pull origin gh-pages --rebase && cd .. && git add jdl-studio && git commit -m 'jdl-studio submodule updated'"
   },
   "jestSonar": {
     "reportPath": "target/test-results/jest",

diff --git a/src/main/resources/static/jdl-studio b/src/main/resources/static/jdl-studio