Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 14 deletions

diff --git a/app/views/layouts/nav/sidebar/_group_menus.html.haml b/app/views/layouts/nav/sidebar/_group_menus.html.haml
index 8a6183f8efe..a31d61a3eaf 100644
--- a/app/views/layouts/nav/sidebar/_group_menus.html.haml
+++ b/app/views/layouts/nav/sidebar/_group_menus.html.haml
@@ -1,6 +1,3 @@
-- if group_sidebar_link?(:wiki)
-  = render 'layouts/nav/sidebar/wiki_link', wiki_url: @group.wiki.web_url
-
 - if group_sidebar_link?(:settings)
   = nav_link(path: group_settings_nav_link_paths) do
     = link_to edit_group_path(@group), class: 'has-sub-items' do
diff --git a/app/views/layouts/nav/sidebar/_wiki_link.html.haml b/app/views/layouts/nav/sidebar/_wiki_link.html.haml
deleted file mode 100644
index b6b63b75fcc..00000000000
--- a/app/views/layouts/nav/sidebar/_wiki_link.html.haml
+++ /dev/null
@@ -1,11 +0,0 @@
-= nav_link(controller: :wikis) do
-  = link_to wiki_url, class: 'shortcuts-wiki', data: { qa_selector: 'wiki_link' } do
-    .nav-icon-container
-      = sprite_icon('book')
-    %span.nav-item-name
-      = _('Wiki')
-  %ul.sidebar-sub-level-items.is-fly-out-only
-    = nav_link(controller: :wikis, html_options: { class: "fly-out-top-item" } ) do
-      = link_to wiki_url do
-        %strong.fly-out-top-item-name
-          = _('Wiki')