summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-06-15 12:32:22 +0000
committerPhil Hughes <me@iamphill.com>2018-06-15 12:32:22 +0000
commit03b88937757238c26a0bd2f3446dde03e7041b36 (patch)
tree9a2b029a871f548286712d5e122143cd4ca821d1
parent2634ef3d70922d7621cc378cab4170f38ca2c263 (diff)
parente36436fe9dd381bd8f7634e4a5bdd9b3436fc44b (diff)
downloadgitlab-ce-03b88937757238c26a0bd2f3446dde03e7041b36.tar.gz
Merge branch 'adding-package-lock-ignore' into 'master'
Update .gitignore with ignoring package-lock.json See merge request gitlab-org/gitlab-ce!19890
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 51b77d5ac9e..21dc67384aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,4 @@ eslint-report.html
/.rspec
/plugins/*
/.gitlab_pages_secret
+package-lock.json