Move search to separate layout

5 files changed, 14 insertions, 11 deletions

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index ccc6f7a9d2d..4cbd9d8758c 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -418,3 +418,7 @@ img.emoji {
   overflow: hidden;
   height: 220px;
 }
+
+.search-container {
+  margin-top: 30px;
+}
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml
index 2ac35050b64..cae24c3170d 100644
--- a/app/views/layouts/nav/_dashboard.html.haml
+++ b/app/views/layouts/nav/_dashboard.html.haml
@@ -13,8 +13,6 @@
     = link_to merge_requests_dashboard_path do
       Merge Requests
       %span.count= current_user.cared_merge_requests.opened.count
-  = nav_link(path: 'search#show') do
-    = link_to "Search", search_path
   = nav_link(controller: :help) do
     = link_to "Help", help_path
 
diff --git a/app/views/layouts/search.html.haml b/app/views/layouts/search.html.haml
new file mode 100644
index 00000000000..01da8f1c53b
--- /dev/null
+++ b/app/views/layouts/search.html.haml
@@ -0,0 +1,10 @@
+!!! 5
+%html{ lang: "en"}
+  = render "layouts/head", title: "Search"
+  %body{class: "#{app_theme} application"}
+    = render "layouts/head_panel", title: "Search"
+    = render "layouts/flash"
+
+    .container.search-container
+      .content
+        = yield
diff --git a/features/dashboard/active_tab.feature b/features/dashboard/active_tab.feature
index 6715ea269c7..3e1cf5aa0ca 100644
--- a/features/dashboard/active_tab.feature
+++ b/features/dashboard/active_tab.feature
@@ -17,11 +17,6 @@ Feature: Dashboard active tab
     Then the active main tab should be Merge Requests
     And no other main tabs should be active
 
-  Scenario: On Dashboard Search
-    Given I visit dashboard search page
-    Then the active main tab should be Search
-    And no other main tabs should be active
-
   Scenario: On Dashboard Help
     Given I visit dashboard help page
     Then the active main tab should be Help
diff --git a/features/steps/dashboard/dashboard_active_tab.rb b/features/steps/dashboard/dashboard_active_tab.rb
index 41ecc48c0d3..8f5f0eed816 100644
--- a/features/steps/dashboard/dashboard_active_tab.rb
+++ b/features/steps/dashboard/dashboard_active_tab.rb
@@ -15,10 +15,6 @@ class DashboardActiveTab < Spinach::FeatureSteps
     ensure_active_main_tab('Merge Requests')
   end
 
-  Then 'the active main tab should be Search' do
-    ensure_active_main_tab('Search')
-  end
-
   Then 'the active main tab should be Help' do
     ensure_active_main_tab('Help')
   end