Commit 4eb6c4a5 authored by Matthieu BENOIST's avatar Matthieu BENOIST
Browse files

Merge branch 'DOS0063936' into 'master'

Dos0063936

See merge request !13
parents 8c248d9c d6eba985
Pipeline #10180 passed with stage
in 5 seconds
...@@ -14,6 +14,7 @@ sonarqube: ...@@ -14,6 +14,7 @@ sonarqube:
- build - build
only: only:
- master - master
- development
before_script: before_script:
- export PATH=$PATH:/usr/local/bin/sonar-scanner-3.2.0.1227-linux/bin/ - export PATH=$PATH:/usr/local/bin/sonar-scanner-3.2.0.1227-linux/bin/
- export NODE_PATH=$NODE_PATH:`npm root -g` - export NODE_PATH=$NODE_PATH:`npm root -g`
......
FROM node:12.13-slim FROM node:14.15.1-slim
# Create app directory # Create app directory
WORKDIR /app WORKDIR /app
......
This diff is collapsed.
{ {
"name": "service-organizations", "name": "service-organizations",
"version": "3.0.1", "version": "3.1.0",
"description": "description", "description": "description",
"author": "", "author": "",
"license": "GNU Affero General Public License v3.0", "license": "GNU Affero General Public License v3.0",
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
"reflect-metadata": "^0.1.12", "reflect-metadata": "^0.1.12",
"rxjs": "^6.2.2", "rxjs": "^6.2.2",
"serve-favicon": "^2.5.0", "serve-favicon": "^2.5.0",
"typeorm": "^0.2.20", "typeorm": "^0.2.29",
"typescript": "^3.0.1" "typescript": "^3.0.1"
}, },
"devDependencies": { "devDependencies": {
...@@ -81,4 +81,4 @@ ...@@ -81,4 +81,4 @@
"coverageDirectory": "../coverage", "coverageDirectory": "../coverage",
"testEnvironment": "node" "testEnvironment": "node"
} }
} }
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment