Add latest changes from gitlab-org/gitlab@master

2 files changed, 1 insertions, 57 deletions

diff --git a/app/assets/javascripts/snippet/snippet_bundle.js b/app/assets/javascripts/snippet/snippet_bundle.js
deleted file mode 100644
index 76a1f6d1458..00000000000
--- a/app/assets/javascripts/snippet/snippet_bundle.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import { initEditorLite } from '~/blob/utils';
-import setupCollapsibleInputs from './collapsible_input';
-
-let editor;
-
-const initMonaco = () => {
-  const editorEl = document.getElementById('editor');
-  const contentEl = document.querySelector('.snippet-file-content');
-  const fileNameEl = document.querySelector('.js-snippet-file-name');
-  const form = document.querySelector('.snippet-form-holder form');
-
-  editor = initEditorLite({
-    el: editorEl,
-    blobPath: fileNameEl.value,
-    blobContent: contentEl.value,
-  });
-
-  fileNameEl.addEventListener('change', () => {
-    editor.updateModelLanguage(fileNameEl.value);
-  });
-
-  form.addEventListener('submit', () => {
-    contentEl.value = editor.getValue();
-  });
-};
-
-export default () => {
-  initMonaco();
-  setupCollapsibleInputs();
-};
diff --git a/app/assets/javascripts/snippet/snippet_edit.js b/app/assets/javascripts/snippet/snippet_edit.js
index 3dc74922a77..f51d9ca7eeb 100644
--- a/app/assets/javascripts/snippet/snippet_edit.js
+++ b/app/assets/javascripts/snippet/snippet_edit.js
@@ -1,33 +1,7 @@
-import $ from 'jquery';
-import initSnippet from '~/snippet/snippet_bundle';
 import ZenMode from '~/zen_mode';
-import GLForm from '~/gl_form';
 import { SnippetEditInit } from '~/snippets';
 
 document.addEventListener('DOMContentLoaded', () => {
-  const form = document.querySelector('.snippet-form');
-  const personalSnippetOptions = {
-    members: false,
-    issues: false,
-    mergeRequests: false,
-    epics: false,
-    milestones: false,
-    labels: false,
-    snippets: false,
-    vulnerabilities: false,
-  };
-  const projectSnippetOptions = {};
-
-  const options =
-    form.dataset.snippetType === 'project' || form.dataset.projectPath
-      ? projectSnippetOptions
-      : personalSnippetOptions;
-
-  if (gon?.features?.snippetsEditVue) {
-    SnippetEditInit();
-  } else {
-    initSnippet();
-    new GLForm($(form), options); // eslint-disable-line no-new
-  }
+  SnippetEditInit();
   new ZenMode(); // eslint-disable-line no-new
 });