From 10ed13acc0ec9d8eaa76cb406a064be48b21c517 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 1 Aug 2018 15:08:12 +0100
Subject: [PATCH] Add package-lock to .gitignore

---
 .gitignore          | 3 +++
 src/vector/index.js | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 14030632..2929685a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,6 @@ electron/pub
 /config.json.*
 /config.local*.json
 /src/component-index.js
+
+# https://github.com/vector-im/riot-web/issues/7083
+package-lock.json
diff --git a/src/vector/index.js b/src/vector/index.js
index 14e181d9..dd720171 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -25,13 +25,13 @@ require('gfm.css/gfm.css');
 require('highlight.js/styles/github.css');
 require('draft-js/dist/Draft.css');
 
-const rageshake = require("matrix-react-sdk/lib/rageshake/rageshake");
+/*const rageshake = require("matrix-react-sdk/lib/rageshake/rageshake");
 rageshake.init().then(() => {
     console.log("Initialised rageshake: See https://bugs.chromium.org/p/chromium/issues/detail?id=583193 to fix line numbers on Chrome.");
     rageshake.cleanup();
 }, (err) => {
     console.error("Failed to initialise rageshake: " + err);
-});
+});*/
 
 window.addEventListener('beforeunload', (e) => {
     console.log('riot-web closing');