Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 10 deletions

diff --git a/app/assets/javascripts/merge_request.js b/app/assets/javascripts/merge_request.js
index b967a790fac..3a7ade5ad94 100644
--- a/app/assets/javascripts/merge_request.js
+++ b/app/assets/javascripts/merge_request.js
@@ -1,4 +1,4 @@
-/* eslint-disable func-names, no-var, no-underscore-dangle, one-var, consistent-return */
+/* eslint-disable func-names, no-underscore-dangle, consistent-return */
 
 import $ from 'jquery';
 import { __ } from '~/locale';
@@ -64,12 +64,10 @@ MergeRequest.prototype.showAllCommits = function() {
 };
 
 MergeRequest.prototype.initMRBtnListeners = function() {
-  var _this;
-  _this = this;
+  const _this = this;
   return $('a.btn-close, a.btn-reopen').on('click', function(e) {
-    var $this, shouldSubmit;
-    $this = $(this);
-    shouldSubmit = $this.hasClass('btn-comment');
+    const $this = $(this);
+    const shouldSubmit = $this.hasClass('btn-comment');
     if (shouldSubmit && $this.data('submitted')) {
       return;
     }
@@ -88,8 +86,7 @@ MergeRequest.prototype.initMRBtnListeners = function() {
 };
 
 MergeRequest.prototype.submitNoteForm = function(form, $button) {
-  var noteText;
-  noteText = form.find('textarea.js-note-text').val();
+  const noteText = form.find('textarea.js-note-text').val();
   if (noteText.trim().length > 0) {
     form.submit();
     $button.data('submitted', true);
@@ -99,7 +96,7 @@ MergeRequest.prototype.submitNoteForm = function(form, $button) {
 
 MergeRequest.prototype.initCommitMessageListeners = function() {
   $(document).on('click', 'a.js-with-description-link', e => {
-    var textarea = $('textarea.js-commit-message');
+    const textarea = $('textarea.js-commit-message');
     e.preventDefault();
 
     textarea.val(textarea.data('messageWithDescription'));
@@ -108,7 +105,7 @@ MergeRequest.prototype.initCommitMessageListeners = function() {
   });
 
   $(document).on('click', 'a.js-without-description-link', e => {
-    var textarea = $('textarea.js-commit-message');
+    const textarea = $('textarea.js-commit-message');
     e.preventDefault();
 
     textarea.val(textarea.data('messageWithoutDescription'));