Merge branch 'master' into fix-go-gitea#6946-stop-running-hooks-on-pr…

…-merge
zeripath · May 16, 2019 · de01ce4 · de01ce4
2 parents c7f4c9c + 04f996f
commit de01ce4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3,075 deletions.
diff --git a/.gitignore b/.gitignore
@@ -67,6 +67,8 @@ coverage.all
 /node_modules
 /modules/indexer/issues/indexers
 routers/repo/authorized_keys
+/package-lock.json
+/yarn.lock
 
 # Snapcraft
 snap/.snapcraft/

diff --git a/.npmrc b/.npmrc
@@ -0,0 +1,2 @@
+package-lock=false
+save-exact=true