Skip to content
Snippets Groups Projects
Commit 29b1e5ee authored by Fabien Forestier's avatar Fabien Forestier
Browse files

Merge branch 'development' into 'master' 

Version 1.0.0

See merge request refonte-data/admin-gui!2
parents a2131eba a76b2180
Branches
Tags
6 merge requests!10New updated datalog,!9add all datalog components and services into angular gui,!8update Datalog research input,!4Add logs pannels to updated admin gui,!7Datalog research input,!2Version 1.0.0
Pipeline #2902 passed
Stage: build
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 2
− 2
View file @ 29b1e5ee
...@@ -22,8 +22,8 @@ build_release: ...@@ -22,8 +22,8 @@ build_release:
- build - build
only: only:
- tags - tags
except: # except:
- /^(?!master).+@/ # - /^(?!master).+@/
script: script:
- export TAG=$(echo $CI_COMMIT_TAG | sed 's/v//g') - export TAG=$(echo $CI_COMMIT_TAG | sed 's/v//g')
- export APP_PORT=8090 - export APP_PORT=8090
......
angular.json
+ 2
− 2
View file @ 29b1e5ee
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
"buildOptimizer": false, "buildOptimizer": false,
"fileReplacements": [] "fileReplacements": []
}, },
"recette": { "production": {
"fileReplacements": [ "fileReplacements": [
{ {
"replace": "src/environments/environment.ts", "replace": "src/environments/environment.ts",
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
"optimization": true, "optimization": true,
"outputHashing": "all", "outputHashing": "all",
"sourceMap": false, "sourceMap": false,
"extractCss": true, "extractCss": false,
"namedChunks": false, "namedChunks": false,
"aot": true, "aot": true,
"extractLicenses": true, "extractLicenses": true,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment