Add latest changes from gitlab-org/gitlab@master

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.