Merge branch 'MDL-63346_33' of https://github.com/stronk7/moodle into MOODLE_33_STABLE

2018-09-25 09:13:44 +08:00
parent 982839422f cc22614602
commit 371168e848
2 changed files with 886 additions and 925 deletions
@@ -264,7 +264,9 @@ script:
        grunt ;
        # Add all files to the git index and then run diff --cached to see all changes.
        # This ensures that we get the status of all files, including new files.
+        # We ignore npm-shrinkwrap.json to make the tasks immune to npm changes.
        git add . ;
+        git reset -- npm-shrinkwrap.json ;
        git diff --cached --exit-code ;
      fi