Merge remote-tracking branch 'origin/maven/fixes/8.1' into maven/rele…

…ase/8.1
edu-sharing · Nov 7, 2023 · 6857e99 · 6857e99
2 parents c7c5b25 + 5027b58
commit 6857e99
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -36,7 +36,7 @@ deploy_release:
   image: php:latest
   stage: deploy
   artifacts:
-    name: 'educonnector_release$(date +"%Y-%m-%d")${CI_COMMIT_SHORT_SHA}'
+    name: "educonnector_release-$CI_PIPELINE_CREATED_AT-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA"
     paths:
       - ./service/src/main/php
   before_script:

diff --git a/service/src/main/php/src/tools/tinymce/js/tool.js b/service/src/main/php/src/tools/tinymce/js/tool.js
@@ -79,7 +79,7 @@ $(document).ready(function() {
             tinyMCE.activeEditor.save(); // to reset isDirty
             save();
         }
-    }, 300000);
+    }, 30000);
 
     if(access < 1) {
         destroy([language.functiondeactivatedheading, language.functiondeactivatedtext, language.closeeditor]);