From 26384c9a61da9922b8fa4b8351d4e42d51661b37 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 5 Feb 2020 09:08:43 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/assets/javascripts/ide/components/nav_form.vue           | 8 ++++----
 app/assets/javascripts/ide/components/new_dropdown/index.vue | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'app/assets/javascripts/ide')

diff --git a/app/assets/javascripts/ide/components/nav_form.vue b/app/assets/javascripts/ide/components/nav_form.vue
index 23c068f329d..2ccc84ea5d5 100644
--- a/app/assets/javascripts/ide/components/nav_form.vue
+++ b/app/assets/javascripts/ide/components/nav_form.vue
@@ -19,15 +19,15 @@ export default {
     <tabs stop-propagation>
       <tab active>
         <template slot="title">
-          {{ __('Merge Requests') }}
+          {{ __('Branches') }}
         </template>
-        <merge-request-search-list />
+        <branches-search-list />
       </tab>
       <tab>
         <template slot="title">
-          {{ __('Branches') }}
+          {{ __('Merge Requests') }}
         </template>
-        <branches-search-list />
+        <merge-request-search-list />
       </tab>
     </tabs>
   </div>
diff --git a/app/assets/javascripts/ide/components/new_dropdown/index.vue b/app/assets/javascripts/ide/components/new_dropdown/index.vue
index bcaaa8e09c2..b2fa020fb00 100644
--- a/app/assets/javascripts/ide/components/new_dropdown/index.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/index.vue
@@ -51,7 +51,7 @@ export default {
 </script>
 
 <template>
-  <div class="ide-new-btn d-none">
+  <div class="ide-new-btn">
     <div
       :class="{
         show: isOpen,
-- 
cgit v1.2.3