Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 5 deletions

diff --git a/app/assets/javascripts/ide/components/repo_editor.vue b/app/assets/javascripts/ide/components/repo_editor.vue
index c93a95e490a..08850679152 100644
--- a/app/assets/javascripts/ide/components/repo_editor.vue
+++ b/app/assets/javascripts/ide/components/repo_editor.vue
@@ -11,7 +11,6 @@ import {
   FILE_VIEW_MODE_PREVIEW,
 } from '../constants';
 import Editor from '../lib/editor';
-import ExternalLink from './external_link.vue';
 import FileTemplatesBar from './file_templates/bar.vue';
 import { __ } from '~/locale';
 
@@ -19,7 +18,6 @@ export default {
   components: {
     ContentViewer,
     DiffViewer,
-    ExternalLink,
     FileTemplatesBar,
   },
   props: {
@@ -275,8 +273,8 @@ export default {
 
 <template>
   <div id="ide" class="blob-viewer-container blob-editor-container">
-    <div class="ide-mode-tabs clearfix">
-      <ul v-if="!shouldHideEditor && isEditModeActive" class="nav-links float-left border-bottom-0">
+    <div v-if="!shouldHideEditor && isEditModeActive" class="ide-mode-tabs clearfix">
+      <ul class="nav-links float-left border-bottom-0">
         <li :class="editTabCSS">
           <a
             href="javascript:void(0);"
@@ -296,7 +294,6 @@ export default {
           >
         </li>
       </ul>
-      <external-link :file="file" />
     </div>
     <file-templates-bar v-if="showFileTemplatesBar(file.name)" />
     <div
diff --git a/app/assets/javascripts/notes/components/sort_discussion.vue b/app/assets/javascripts/notes/components/sort_discussion.vue
index 16eded52763..3f82ddde3ef 100644
--- a/app/assets/javascripts/notes/components/sort_discussion.vue
+++ b/app/assets/javascripts/notes/components/sort_discussion.vue
@@ -2,6 +2,7 @@
 import { GlIcon } from '@gitlab/ui';
 import { mapActions, mapGetters } from 'vuex';
 import { __ } from '~/locale';
+import Tracking from '~/tracking';
 import { ASC, DESC } from '../constants';
 
 const SORT_OPTIONS = [
@@ -14,6 +15,7 @@ export default {
   components: {
     GlIcon,
   },
+  mixins: [Tracking.mixin()],
   computed: {
     ...mapGetters(['sortDirection']),
     selectedOption() {
@@ -31,6 +33,7 @@ export default {
       }
 
       this.setDiscussionSortDirection(direction);
+      this.track('change_discussion_sort_direction', { property: direction });
     },
     isDropdownItemActive(sortDir) {
       return sortDir === this.sortDirection;