Merges master

2020-03-14 12:05:38 -05:00
parent 8fcfef08a6 be9287c70a
commit 2e0528b754
18 changed files with 1453 additions and 89822 deletions
--- a/app/assets/javascripts/controllers/lockScreen.js
+++ b/app/assets/javascripts/controllers/lockScreen.js
@@ -39,7 +39,7 @@ class LockScreenCtrl extends PureCtrl {
    }
  }

-  async submitPasscodeForm($event) {
+  async submitPasscodeForm() {
    if (
      !this.formData.passcode ||
      this.formData.passcode.length === 0
@@ -78,4 +78,4 @@ export class LockScreen {
      puppet: '='
    };
  }
-}
+}