diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-19 12:09:33 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-19 12:09:33 +0000 |
commit | 652bd073731b0028641672a75355c7918b5ac116 (patch) | |
tree | e0239f98153492ac89c6fc374c5dfd1aa270d8bf /lib/gitlab | |
parent | 2af90cef2e2e9c776eae4394a43dba3be7f33d1e (diff) | |
download | gitlab-ce-652bd073731b0028641672a75355c7918b5ac116.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/hook_data/wiki_page_builder.rb | 4 | ||||
-rw-r--r-- | lib/gitlab/metrics/dashboard/stages/custom_metrics_details_inserter.rb (renamed from lib/gitlab/metrics/dashboard/stages/project_metrics_details_inserter.rb) | 2 | ||||
-rw-r--r-- | lib/gitlab/metrics/dashboard/stages/custom_metrics_inserter.rb (renamed from lib/gitlab/metrics/dashboard/stages/project_metrics_inserter.rb) | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab/hook_data/wiki_page_builder.rb b/lib/gitlab/hook_data/wiki_page_builder.rb index 67f06b1ca46..78ae896a3d8 100644 --- a/lib/gitlab/hook_data/wiki_page_builder.rb +++ b/lib/gitlab/hook_data/wiki_page_builder.rb @@ -12,6 +12,10 @@ module Gitlab 'content' => absolute_image_urls(wiki_page.content) ) end + + def uploads_prefix + '' + end end end end diff --git a/lib/gitlab/metrics/dashboard/stages/project_metrics_details_inserter.rb b/lib/gitlab/metrics/dashboard/stages/custom_metrics_details_inserter.rb index a9d11f58255..cfec027155e 100644 --- a/lib/gitlab/metrics/dashboard/stages/project_metrics_details_inserter.rb +++ b/lib/gitlab/metrics/dashboard/stages/custom_metrics_details_inserter.rb @@ -4,7 +4,7 @@ module Gitlab module Metrics module Dashboard module Stages - class ProjectMetricsDetailsInserter < BaseStage + class CustomMetricsDetailsInserter < BaseStage def transform! dashboard[:panel_groups].each do |panel_group| next unless panel_group diff --git a/lib/gitlab/metrics/dashboard/stages/project_metrics_inserter.rb b/lib/gitlab/metrics/dashboard/stages/custom_metrics_inserter.rb index 26345c265ef..3444a01bccd 100644 --- a/lib/gitlab/metrics/dashboard/stages/project_metrics_inserter.rb +++ b/lib/gitlab/metrics/dashboard/stages/custom_metrics_inserter.rb @@ -4,7 +4,7 @@ module Gitlab module Metrics module Dashboard module Stages - class ProjectMetricsInserter < BaseStage + class CustomMetricsInserter < BaseStage # Inserts project-specific metrics into the dashboard # config. If there are no project-specific metrics, # this will have no effect. |