Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 1 deletions

diff --git a/doc/user/group/compliance_frameworks.md b/doc/user/group/compliance_frameworks.md
index 0940f120466..4d3d9318f33 100644
--- a/doc/user/group/compliance_frameworks.md
+++ b/doc/user/group/compliance_frameworks.md
@@ -106,6 +106,12 @@ However, the compliance pipeline configuration can reference the `.gitlab-ci.yml
 See [example configuration](#example-configuration) for help configuring a compliance pipeline that runs jobs from
 labeled project pipeline configuration.
 
+Be aware that users have no way of knowing that a compliance pipeline has been configured and might be confused
+why their own pipelines are not running at all, or include jobs that they did not define themselves. When authoring
+pipelines on a labeled project, there is no indication that a compliance pipeline has been configured. The only marker
+at the project level is the compliance framework label itself, but the label does not say whether the framework has a
+compliance pipeline configured or not.
+
 To configure a compliance pipeline:
 
 1. On the top bar, select **Main menu > Groups > View all groups** and find your group.
diff --git a/doc/user/group/import/index.md b/doc/user/group/import/index.md
index e9ac3cb3225..7f8bb95f4d5 100644
--- a/doc/user/group/import/index.md
+++ b/doc/user/group/import/index.md
@@ -261,7 +261,7 @@ you can find the failure or error messages for the group import attempt using:
 
 ```ruby
 # Get relevant import records
-import = BulkImports::Entity.where(namespace_id: Group.id).map(&:bulk_import)
+import = BulkImports::Entity.where(namespace_id: Group.id).map(&:bulk_import).last
 
 # Alternative lookup by user
 import = BulkImport.where(user_id: User.find(...)).last