Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 10 deletions

diff --git a/app/assets/javascripts/lib/utils/common_utils.js b/app/assets/javascripts/lib/utils/common_utils.js
index f88a0433535..9e52de4b959 100644
--- a/app/assets/javascripts/lib/utils/common_utils.js
+++ b/app/assets/javascripts/lib/utils/common_utils.js
@@ -68,7 +68,7 @@ export const disableButtonIfEmptyField = (fieldSelector, buttonSelector, eventNa
     closestSubmit.disable();
   }
   // eslint-disable-next-line func-names
-  return field.on(eventName, function() {
+  return field.on(eventName, function () {
     if (rstrip($(this).val()) === '') {
       return closestSubmit.disable();
     }
diff --git a/app/assets/javascripts/lib/utils/text_markdown.js b/app/assets/javascripts/lib/utils/text_markdown.js
index c711c0bd163..edff057997a 100644
--- a/app/assets/javascripts/lib/utils/text_markdown.js
+++ b/app/assets/javascripts/lib/utils/text_markdown.js
@@ -14,18 +14,12 @@ function addBlockTags(blockTag, selected) {
 }
 
 function lineBefore(text, textarea) {
-  const split = text
-    .substring(0, textarea.selectionStart)
-    .trim()
-    .split('\n');
+  const split = text.substring(0, textarea.selectionStart).trim().split('\n');
   return split[split.length - 1];
 }
 
 function lineAfter(text, textarea) {
-  return text
-    .substring(textarea.selectionEnd)
-    .trim()
-    .split('\n')[0];
+  return text.substring(textarea.selectionEnd).trim().split('\n')[0];
 }
 
 function convertMonacoSelectionToAceFormat(sel) {
@@ -342,7 +336,7 @@ export function addMarkdownListeners(form) {
   // eslint-disable-next-line @gitlab/no-global-event-off
   const $allToolbarBtns = $('.js-md', form)
     .off('click')
-    .on('click', function() {
+    .on('click', function () {
       const $toolbarBtn = $(this);
 
       return updateTextForToolbarBtn($toolbarBtn);