summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/terminal
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-12-08 21:10:06 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-08 21:10:06 +0000
commitcb36ae7dd5fde175f8a24bfa97b20e9b2e2058bf (patch)
tree691c6406d0eea6c8417ecf99a47c77ca6b90cc18 /app/assets/javascripts/terminal
parent0612ffef1200ffdcc9443c0469f7874b37271275 (diff)
downloadgitlab-ce-cb36ae7dd5fde175f8a24bfa97b20e9b2e2058bf.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/terminal')
-rw-r--r--app/assets/javascripts/terminal/terminal.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/terminal/terminal.js b/app/assets/javascripts/terminal/terminal.js
index cf9064aba57..bae320cb705 100644
--- a/app/assets/javascripts/terminal/terminal.js
+++ b/app/assets/javascripts/terminal/terminal.js
@@ -25,6 +25,7 @@ export default class GLTerminal {
this.setSocketUrl();
this.createTerminal();
+ // eslint-disable-next-line @gitlab/no-global-event-off
$(window)
.off('resize.terminal')
.on('resize.terminal', () => {
@@ -104,6 +105,7 @@ export default class GLTerminal {
}
dispose() {
+ // eslint-disable-next-line @gitlab/no-global-event-off
this.terminal.off('data');
this.terminal.dispose();
this.socket.close();