diff --git a/.gitignore b/.gitignore index 1935ddc44..b3e0a35fb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,12 +7,14 @@ composer.phar upgrade.log temp.txt update.sh +.env # Ignore build artifacts and logs workflow/public_html/build-log.html workflow/public_html/mix-manifest.json workflow/public_html/index.html workflow/public_html/webapp/ +workflow/public_html/fileManager/ workflow/public_html/translations/ workflow/public_html/files/ workflow/engine/gulliver @@ -37,6 +39,7 @@ vendor/* session.data node_modules/ **/cache/ +storage/ # Ignore test files and directories tests/functional/pm3FunctionalTests.iml @@ -51,4 +54,4 @@ workflow/engine/plugins/* !workflow/engine/plugins/.gitignore # Ignore shared files -shared/ \ No newline at end of file +shared/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 632197908..088614cd1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ build_job: stage: build script: # Download fileManager - - bash docker/download_filemanager.sh "1.0.7" + - bash docker/download_filemanager.sh "1.0.9" - bash docker/build.sh $VERSION before_script: diff --git a/workflow/engine/controllers/admin.php b/workflow/engine/controllers/admin.php index 9e7ef098a..795355821 100644 --- a/workflow/engine/controllers/admin.php +++ b/workflow/engine/controllers/admin.php @@ -272,7 +272,7 @@ class Admin extends Controller $properties = array (); $ee = ''; - $systemName = 'ProcessMaker'; + $systemName = 'Lurana'; if (defined('SYSTEM_NAME')) { $systemName = SYSTEM_NAME; }