fix() resolve conflicts

Author: kamilmysliwiec

.circleci/config.yml

@@ -86,6 +86,9 @@ jobs:
       - run:
           name: Lint
           command: npm run lint
+      - run:
+          name: Lint commit
+          command: ./node_modules/.bin/commitlint-circle -c .commitlintrc.json
 
   integration_tests:
     working_directory: ~/nest

.commitlintrc.json

@@ -0,0 +1,10 @@
+{
+  "extends": ["@commitlint/config-angular"],
+  "rules": {
+    "subject-case": [
+      2,
+      "always",
+      ["sentence-case", "start-case", "pascal-case", "upper-case"]
+    ]
+  }
+}

integration/graphql/package-lock.json

@@ -9,10 +9,10 @@
     "start:prod": "node dist/main.js"
   },
   "dependencies": {
-    "@nestjs/common": "6.8.2",
-    "@nestjs/core": "6.8.2",
+    "@nestjs/common": "6.8.3",
+    "@nestjs/core": "6.8.3",
     "@nestjs/graphql": "6.5.3",
-    "apollo-server-express": "2.9.5",
+    "apollo-server-express": "2.9.6",
     "graphql": "14.5.8",
     "graphql-tools": "4.0.5",
     "reflect-metadata": "0.1.13",