Merge remote-tracking branch 'origin/master' into reduce-num-retries-in-jasmine

Author: archmoj

.eslintrc

@@ -46,6 +46,7 @@
     "space-in-parens": [2, "never"],
     "space-before-function-paren": [2, "never"],
     "space-before-blocks": [2],
+    "padded-blocks": [2, "never"],
     "spaced-comment": [2, "always"],
     "no-tabs": [2],
     "no-multi-spaces": [2, {"ignoreEOLComments": true}],

devtools/test_dashboard/devtools.js

@@ -193,7 +193,6 @@ function debounce(func, wait, immediate) {
 }
 
 function searchMocks(e) {
-
     // Clear results.
     while(mocksList.firstChild) {
         mocksList.removeChild(mocksList.firstChild);

devtools/test_dashboard/server.js

@@ -66,7 +66,6 @@ function readFiles(files) {
 }
 
 function createMocksList(files) {
-
     // eliminate pollutants (e.g .DS_Store) that can accumulate in the mock directory
     var jsonFiles = files.filter(function(file) {
         return file.name.substr(-5) === '.json';