Add latest changes from gitlab-org/gitlab@master

9 files changed, 1 insertions, 9 deletions

diff --git a/app/views/projects/_stat_anchor_list.html.haml b/app/views/projects/_stat_anchor_list.html.haml
index 8cad1974ffa..7f05a20261a 100644
--- a/app/views/projects/_stat_anchor_list.html.haml
+++ b/app/views/projects/_stat_anchor_list.html.haml
@@ -3,7 +3,7 @@
 
 - return unless anchors.any?
 
-%ul.nav.gl-gap-2
+%ul.nav.gl-row-gap-2.gl-column-gap-5
   - anchors.each do |anchor|
     %li.nav-item
       = link_to_if(anchor.link, anchor.label, anchor.link, stat_anchor_attrs(anchor)) do
diff --git a/app/views/projects/commit/show.html.haml b/app/views/projects/commit/show.html.haml
index 5708eacc801..0868475c49f 100644
--- a/app/views/projects/commit/show.html.haml
+++ b/app/views/projects/commit/show.html.haml
@@ -6,7 +6,6 @@
 - page_title        "#{@commit.title} (#{@commit.short_id})", _('Commits')
 - page_description  @commit.description
 - add_page_specific_style 'page_bundles/pipelines'
-- add_page_specific_style 'page_bundles/notes'
 
 .container-fluid{ class: [container_class] }
   = render "commit_box"
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index 09efc2b9c82..be2bf43cbb9 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -2,7 +2,6 @@
 - add_page_specific_style 'page_bundles/tree'
 - add_page_specific_style 'page_bundles/merge_request'
 - add_page_specific_style 'page_bundles/projects'
-- add_page_specific_style 'page_bundles/notes'
 - page_title _("Commits"), @ref
 
 = content_for :meta_tags do
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index e5ede7f1546..457eaf5e194 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -12,7 +12,6 @@
 - add_page_specific_style 'page_bundles/issuable'
 - add_page_specific_style 'page_bundles/issues_show'
 - add_page_specific_style 'page_bundles/work_items'
-- add_page_specific_style 'page_bundles/notes'
 
 - @content_class = "limit-container-width" unless fluid_layout
 
diff --git a/app/views/projects/merge_requests/creations/new.html.haml b/app/views/projects/merge_requests/creations/new.html.haml
index 3c51e826092..f2c2700b012 100644
--- a/app/views/projects/merge_requests/creations/new.html.haml
+++ b/app/views/projects/merge_requests/creations/new.html.haml
@@ -4,7 +4,6 @@
 - add_page_specific_style 'page_bundles/pipelines'
 - add_page_specific_style 'page_bundles/ci_status'
 - add_page_specific_style 'page_bundles/merge_request'
-- add_page_specific_style 'page_bundles/notes'
 
 - conflicting_mr = @merge_request.existing_mrs_targeting_same_branch.first
 
diff --git a/app/views/projects/merge_requests/diffs.html.haml b/app/views/projects/merge_requests/diffs.html.haml
index 5391d2d28ca..03306e98407 100644
--- a/app/views/projects/merge_requests/diffs.html.haml
+++ b/app/views/projects/merge_requests/diffs.html.haml
@@ -1,4 +1,3 @@
 - add_page_specific_style 'page_bundles/merge_request'
-- add_page_specific_style 'page_bundles/notes'
 
 = render 'page'
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index d3c9709d59b..e2d3e082289 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -7,7 +7,6 @@
 - new_merge_request_email = @project.new_issuable_address(current_user, 'merge_request')
 - add_page_specific_style 'page_bundles/issuable_list'
 - add_page_specific_style 'page_bundles/merge_request'
-- add_page_specific_style 'page_bundles/notes'
 
 = content_for :meta_tags do
   = auto_discovery_link_tag(:atom, safe_params.merge(rss_url_options).to_h, title: "#{@project.name} merge requests")
diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml
index 5391d2d28ca..03306e98407 100644
--- a/app/views/projects/merge_requests/show.html.haml
+++ b/app/views/projects/merge_requests/show.html.haml
@@ -1,4 +1,3 @@
 - add_page_specific_style 'page_bundles/merge_request'
-- add_page_specific_style 'page_bundles/notes'
 
 = render 'page'
diff --git a/app/views/projects/work_items/show.html.haml b/app/views/projects/work_items/show.html.haml
index 3fee9a73f17..7e0bddf1b5d 100644
--- a/app/views/projects/work_items/show.html.haml
+++ b/app/views/projects/work_items/show.html.haml
@@ -1,7 +1,6 @@
 - page_title "##{request.params['iid']}"
 - add_to_breadcrumbs _("Issues"), project_issues_path(@project)
 - add_page_specific_style 'page_bundles/work_items'
-- add_page_specific_style 'page_bundles/notes'
 - @gfm_form = true
 - @noteable_type = 'WorkItem'