diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 15:09:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 15:09:01 +0300 |
| commit | bd497e352ebd279536ae11855871162e82a3f88c (patch) | |
| tree | 2241444d4be33e199d7011b872713071a8f8cd41 /lib/banzai | |
| parent | 0388886f9439fa93efea29a159522aec5643f7c8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/banzai')
| -rw-r--r-- | lib/banzai/filter/inline_metrics_filter.rb | 2 | ||||
| -rw-r--r-- | lib/banzai/filter/inline_metrics_redactor_filter.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/banzai/filter/inline_metrics_filter.rb b/lib/banzai/filter/inline_metrics_filter.rb index c5a328c21b2..c1f4bf1f97f 100644 --- a/lib/banzai/filter/inline_metrics_filter.rb +++ b/lib/banzai/filter/inline_metrics_filter.rb @@ -25,7 +25,7 @@ module Banzai # Regular expression matching metrics urls def link_pattern - Gitlab::Metrics::Dashboard::Url.regex + Gitlab::Metrics::Dashboard::Url.metrics_regex end private diff --git a/lib/banzai/filter/inline_metrics_redactor_filter.rb b/lib/banzai/filter/inline_metrics_redactor_filter.rb index c70897fccbf..ae830831a27 100644 --- a/lib/banzai/filter/inline_metrics_redactor_filter.rb +++ b/lib/banzai/filter/inline_metrics_redactor_filter.rb @@ -59,7 +59,7 @@ module Banzai embed = Embed.new url = node.attribute('data-dashboard-url').to_s - set_path_and_permission(embed, url, URL.regex, :read_environment) + set_path_and_permission(embed, url, URL.metrics_regex, :read_environment) set_path_and_permission(embed, url, URL.grafana_regex, :read_project) unless embed.permission embeds[node] = embed if embed.permission |