Add latest changes from gitlab-org/gitlab@master

5 files changed, 29 insertions, 5 deletions

diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss
index ecd32dcd0ce..4aba633e182 100644
--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -196,6 +196,11 @@ ul.content-list {
     display: flex;
     align-items: center;
     white-space: nowrap;
+
+    // Override style that allows the flex-row text to wrap.
+    &.allow-wrap {
+      white-space: normal;
+    }
   }
 
   .row-main-content {
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 3ae804ff231..8389272fd35 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -94,6 +94,25 @@ module ApplicationHelper
     sanitize(str, tags: %w(a span))
   end
 
+  def body_data
+    {
+      page: body_data_page,
+      page_type_id: controller.params[:id],
+      find_file: find_file_path,
+      group: "#{@group&.path}"
+    }.merge(project_data)
+  end
+
+  def project_data
+    return {} unless @project
+
+    {
+      project_id: @project.id,
+      project: @project.path,
+      namespace_id: @project.namespace&.id
+    }
+  end
+
   def body_data_page
     [*controller.controller_path.split('/'), controller.action_name].compact.join(':')
   end
diff --git a/app/views/clusters/clusters/_namespace.html.haml b/app/views/clusters/clusters/_namespace.html.haml
index 0c64819ad62..8a86fd90963 100644
--- a/app/views/clusters/clusters/_namespace.html.haml
+++ b/app/views/clusters/clusters/_namespace.html.haml
@@ -1,4 +1,4 @@
-- managed_namespace_help_text = s_('ClusterIntegration|Choose a prefix to be used for your namespaces. Defaults to your project path.')
+- managed_namespace_help_text = s_('ClusterIntegration|Set a prefix for your namespaces. If not set, defaults to your project path. If modified, existing environments will use their current namespaces until the cluster cache is cleared.')
 - non_managed_namespace_help_text = s_('ClusterIntegration|The namespace associated with your project. This will be used for deploy boards, pod logs, and Web terminals.')
 - managed_namespace_help_link = link_to _('More information'), help_page_path('user/project/clusters/index.md',
   anchor: 'gitlab-managed-clusters'), target: '_blank'
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index c38f96f302a..f4ab491a38e 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -1,7 +1,7 @@
 !!! 5
 %html{ lang: I18n.locale, class: page_class }
   = render "layouts/head"
-  %body{ class: "#{user_application_theme} #{@body_class} #{client_class_list}", data: { page: body_data_page, project: "#{@project.path if @project}", group: "#{@group.path if @group}", find_file: find_file_path } }
+  %body{ class: "#{user_application_theme} #{@body_class} #{client_class_list}", data: body_data }
     = render "layouts/init_auto_complete" if @gfm_form
     = render "layouts/init_client_detection_flags"
     = render 'peek/bar'
diff --git a/app/views/projects/tags/_tag.html.haml b/app/views/projects/tags/_tag.html.haml
index b04d484c8a7..75805192a61 100644
--- a/app/views/projects/tags/_tag.html.haml
+++ b/app/views/projects/tags/_tag.html.haml
@@ -1,7 +1,7 @@
 - commit = @repository.commit(tag.dereferenced_target)
 - release = @releases.find { |release| release.tag == tag.name }
-%li.flex-row
-  .row-main-content.str-truncated
+%li.flex-row.allow-wrap
+  .row-main-content
     = icon('tag')
     = link_to tag.name, project_tag_path(@project, tag.name), class: 'item-title ref-name prepend-left-4'
 
@@ -26,7 +26,7 @@
         = _("Release")
         = link_to release.name, project_releases_path(@project, anchor: release.tag), class: 'tag-release-link'
       - if release.description.present?
-        .description.md.prepend-top-default
+        .md.prepend-top-default
           = markdown_field(release, :description)
 
   .row-fixed-content.controls.flex-row