diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 12:55:51 +0300 |
| commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
| tree | c42be41678c2586d49a75cabce89322082698334 /lib/gitlab/utils | |
| parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'lib/gitlab/utils')
| -rw-r--r-- | lib/gitlab/utils/sanitize_node_link.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/utils/usage_data.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/utils/sanitize_node_link.rb b/lib/gitlab/utils/sanitize_node_link.rb index 620d71a7814..ab5d18e9c8a 100644 --- a/lib/gitlab/utils/sanitize_node_link.rb +++ b/lib/gitlab/utils/sanitize_node_link.rb @@ -6,7 +6,7 @@ module Gitlab module Utils module SanitizeNodeLink UNSAFE_PROTOCOLS = %w(data javascript vbscript).freeze - ATTRS_TO_SANITIZE = %w(href src data-src).freeze + ATTRS_TO_SANITIZE = %w(href src data-src data-canonical-src).freeze def remove_unsafe_links(env, remove_invalid_links: true) node = env[:node] diff --git a/lib/gitlab/utils/usage_data.rb b/lib/gitlab/utils/usage_data.rb index 4ea5b5a87de..faa524d171c 100644 --- a/lib/gitlab/utils/usage_data.rb +++ b/lib/gitlab/utils/usage_data.rb @@ -217,7 +217,7 @@ module Gitlab end # rubocop: disable UsageData/LargeTable: - def jira_service_data + def jira_integration_data data = { projects_jira_server_active: 0, projects_jira_cloud_active: 0 |