Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 31 deletions

diff --git a/app/assets/javascripts/blob/file_template_mediator.js b/app/assets/javascripts/blob/file_template_mediator.js
index 77910850908..59ab84bf208 100644
--- a/app/assets/javascripts/blob/file_template_mediator.js
+++ b/app/assets/javascripts/blob/file_template_mediator.js
@@ -7,7 +7,6 @@ import toast from '~/vue_shared/plugins/global_toast';
 
 import { deprecatedCreateFlash as Flash } from '../flash';
 
-import BlobCiSyntaxYamlSelector from './template_selectors/ci_syntax_yaml_selector';
 import BlobCiYamlSelector from './template_selectors/ci_yaml_selector';
 import DockerfileSelector from './template_selectors/dockerfile_selector';
 import GitignoreSelector from './template_selectors/gitignore_selector';
@@ -34,7 +33,6 @@ export default class FileTemplateMediator {
     this.templateSelectors = [
       GitignoreSelector,
       BlobCiYamlSelector,
-      BlobCiSyntaxYamlSelector,
       MetricsDashboardSelector,
       DockerfileSelector,
       LicenseSelector,
diff --git a/app/assets/javascripts/blob/template_selectors/ci_syntax_yaml_selector.js b/app/assets/javascripts/blob/template_selectors/ci_syntax_yaml_selector.js
deleted file mode 100644
index c30ff4f1290..00000000000
--- a/app/assets/javascripts/blob/template_selectors/ci_syntax_yaml_selector.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
-import FileTemplateSelector from '../file_template_selector';
-
-export default class BlobCiSyntaxYamlSelector extends FileTemplateSelector {
-  constructor({ mediator }) {
-    super(mediator);
-    this.config = {
-      key: 'gitlab-ci-yaml',
-      name: '.gitlab-ci.yml',
-      pattern: /(.gitlab-ci.yml)/,
-      type: 'gitlab_ci_syntax_ymls',
-      dropdown: '.js-gitlab-ci-syntax-yml-selector',
-      wrapper: '.js-gitlab-ci-syntax-yml-selector-wrap',
-    };
-  }
-
-  initDropdown() {
-    initDeprecatedJQueryDropdown(this.$dropdown, {
-      data: this.$dropdown.data('data'),
-      filterable: true,
-      selectable: true,
-      search: {
-        fields: ['name'],
-      },
-      clicked: (options) => this.reportSelectionName(options),
-      text: (item) => item.name,
-    });
-  }
-}