Add latest changes from gitlab-org/gitlab@master

4 files changed, 23 insertions, 1 deletions

diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 634b8a6c2d7..cc3a1019c48 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -5016,6 +5016,11 @@ type DastSiteProfile {
   id: DastSiteProfileID!
 
   """
+  Normalized URL of the target to be scanned
+  """
+  normalizedTargetUrl: String
+
+  """
   The name of the site profile
   """
   profileName: String
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index d95bf902496..7066f2b5dc6 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -13727,6 +13727,20 @@
               "deprecationReason": null
             },
             {
+              "name": "normalizedTargetUrl",
+              "description": "Normalized URL of the target to be scanned",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
               "name": "profileName",
               "description": "The name of the site profile",
               "args": [
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index e00696fdc12..d716f25ab52 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -827,6 +827,7 @@ Represents a DAST Site Profile.
 | ----- | ---- | ----------- |
 | `editPath` | String | Relative web path to the edit page of a site profile |
 | `id` | DastSiteProfileID! | ID of the site profile |
+| `normalizedTargetUrl` | String | Normalized URL of the target to be scanned |
 | `profileName` | String | The name of the site profile |
 | `targetUrl` | String | The URL of the target to be scanned |
 | `userPermissions` | DastSiteProfilePermissions! | Permissions for the current user on the resource |
diff --git a/doc/development/fe_guide/icons.md b/doc/development/fe_guide/icons.md
index 32f5168a99e..53c84a570be 100644
--- a/doc/development/fe_guide/icons.md
+++ b/doc/development/fe_guide/icons.md
@@ -22,7 +22,7 @@ Our goal is to replace one by one all inline SVG Icons (as those currently bloat
 
 ### Usage in HAML/Rails
 
-To use a sprite Icon in HAML or Rails we use a specific helper function :
+To use a sprite Icon in HAML or Rails we use a specific helper function:
 
 ```ruby
 sprite_icon(icon_name, size: nil, css_class: '')
@@ -48,6 +48,8 @@ sprite_icon(icon_name, size: nil, css_class: '')
 </svg>
 ```
 
+**Please note:** The `icon(icon_name, options: {})` helper function is deprecated and should not be used anymore.
+
 ### Usage in Vue
 
 [GitLab UI](https://gitlab-org.gitlab.io/gitlab-ui/), our components library, provides a component to display sprite icons.