From bbd62f1683082e811e23aab9ea939b8e3e35dfc9 Mon Sep 17 00:00:00 2001
From: Matthias Wirtz <matthias.wirtz@hotmail.de>
Date: Fri, 2 Mar 2018 11:41:54 +0000
Subject: [PATCH] Master

---
 .gitattributes        |  6 ++++++
 .vscode/settings.json |  5 +++--
 package-lock.json     |  2 +-
 package.json          | 21 ++++++++++++++++-----
 4 files changed, 26 insertions(+), 8 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..9c37d77
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,6 @@
+# As suggested by ESLint let's disable conversion of LF linebreaks to CRLF
+# when checking out files on Windows
+
+# https://eslint.org/docs/rules/linebreak-style#using-this-rule-with-version-control-systems
+
+*.js text eol=lf
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 6aac368..93c874b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,5 +1,6 @@
 {
   "editor.formatOnSave": true,
   "javascript.validate.enable": false,
-  "eslint.enable": true
-}
+  "eslint.enable": true,
+  "gitlab.instanceUrl": "https://gitlab.com"
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index c2a99da..81b501a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "gitlab-workflow",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c4d9133..3044183 100644
--- a/package.json
+++ b/package.json
@@ -11,9 +11,19 @@
   "engines": {
     "vscode": "^1.19.0"
   },
-  "categories": ["Other"],
-  "keywords": ["git", "gitlab", "merge request", "pipeline", "ci cd"],
-  "activationEvents": ["*"],
+  "categories": [
+    "Other"
+  ],
+  "keywords": [
+    "git",
+    "gitlab",
+    "merge request",
+    "pipeline",
+    "ci cd"
+  ],
+  "activationEvents": [
+    "*"
+  ],
   "bugs": {
     "url": "https://gitlab.com/fatihacet/gitlab-vscode-extension/issues",
     "email": "acetfatih@gmail.com"
@@ -25,7 +35,8 @@
   "main": "./src/extension",
   "icon": "src/assets/logo.png",
   "contributes": {
-    "commands": [{
+    "commands": [
+      {
         "command": "gl.setToken",
         "title": "GitLab: Set GitLab Personal Access Token"
       },
@@ -131,4 +142,4 @@
     "@types/node": "^7.0.43",
     "vscode": "^1.1.6"
   }
-}
\ No newline at end of file
+}
-- 
GitLab