Merge remote-tracking branch 'origin/master'

18 files changed, 501 insertions, 10 deletions

diff --git a/lib/gitlab/action_view_output/context.rb b/lib/gitlab/action_view_output/context.rb
new file mode 100644
index 00000000000..9fbc9811636
--- /dev/null
+++ b/lib/gitlab/action_view_output/context.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# This file was simplified from https://raw.githubusercontent.com/rails/rails/195f39804a7a4a0034f25e8704220e03d95a752a/actionview/lib/action_view/context.rb.
+#
+# It is only needed by modules that need to call ActionView helper
+# methods (e.g. those in
+# https://github.com/rails/rails/tree/c4d3e202e10ae627b3b9c34498afb45450652421/actionview/lib/action_view/helpers)
+# to generate tags outside of a Rails controller (e.g. API, Sidekiq,
+# etc.).
+#
+# In Rails 5, ActionView::Context automatically includes CompiledTemplates.
+# This means that any module that includes ActionView::Context is now a descendant
+# of CompiledTemplates.
+#
+# When a partial is rendered for the first time, it runs
+# Module#module_eval, which will evaluate a string source that defines a
+# new method. For example:
+#
+# def _app_views_profiles_show_html_haml___1285955918103175884_70307801785400(local_assigns, output_buffer)
+#   "hello world"
+# end
+#
+# When a new method is defined, the Ruby interpreter clears the method
+# cache for all descendants, and all methods for those modules will have
+# to be redefined.  This can lead to a significant performance penalty.
+#
+# Rails 6 fixes this behavior by moving out the `include
+# CompiledTemplates` into ActionView::Base so that including `ActionView::Context`
+# doesn't quietly affect other modules in this way.
+
+if Rails::VERSION::STRING.start_with?('6')
+  raise 'This module is no longer needed in Rails 6. Use ActionView::Context instead.'
+end
+
+module Gitlab
+  module ActionViewOutput
+    module Context
+      attr_accessor :output_buffer, :view_flow
+    end
+  end
+end
diff --git a/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml b/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml
index 2a90cc9a06c..fd7fac5dcab 100644
--- a/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Security/DAST.gitlab-ci.yml
@@ -30,6 +30,7 @@ dast:
     - |
       function dast_run() {
         docker run \
+        --env DAST_FULL_SCAN_ENABLED \
         --env DAST_TARGET_AVAILABILITY_TIMEOUT \
         --volume "$PWD:/output" \
         --volume /var/run/docker.sock:/var/run/docker.sock \
@@ -46,7 +47,8 @@ dast:
           --auth-username $DAST_USERNAME \
           --auth-password $DAST_PASSWORD \
           --auth-username-field $DAST_USERNAME_FIELD \
-          --auth-password-field $DAST_PASSWORD_FIELD
+          --auth-password-field $DAST_PASSWORD_FIELD \
+          --auth-exclude-urls $DAST_AUTH_EXCLUDE_URLS
       else
         dast_run
       fi
diff --git a/lib/gitlab/ci/templates/dotNET-Core.yml b/lib/gitlab/ci/templates/dotNET-Core.yml
new file mode 100644
index 00000000000..558ca3d22e1
--- /dev/null
+++ b/lib/gitlab/ci/templates/dotNET-Core.yml
@@ -0,0 +1,107 @@
+# This is a simple example illustrating how to build and test .NET Core project
+# with GitLab Continuous Integration / Continuous Delivery.
+
+# ### Specify the Docker image
+#
+# Instead of installing .NET Core SDK manually, a docker image is used 
+# with already pre-installed .NET Core SDK. 
+# The 'latest' tag targets the latest available version of .NET Core SDK image. 
+# If preferred, you can explicitly specify version of .NET Core e.g. using '2.2-sdk' tag.
+#
+# See other available tags for .NET Core: https://hub.docker.com/r/microsoft/dotnet
+# Learn more about Docker tags: https://docs.docker.com/glossary/?term=tag
+# and the Docker itself: https://opensource.com/resources/what-docker
+image: microsoft/dotnet:latest
+
+# ### Define variables
+#
+variables:
+ # 1) Name of directory where restore and build objects are stored.
+ OBJECTS_DIRECTORY: 'obj'    
+ # 2) Name of directory used for keeping restored dependencies.        
+ NUGET_PACKAGES_DIRECTORY: '.nuget'
+ # 3) A relative path to the source code from project repository root.
+ # NOTE: Please edit this path so it matches the structure of your project!
+ SOURCE_CODE_PATH: '*/*/'             
+
+# ### Define stage list
+#
+# In this example there are only two stages. 
+# Initially, the project will be built and then tested.
+stages:
+ - build
+ - test
+
+# ### Define global cache rule
+#
+# Before building the project, all dependencies (e.g. third-party NuGet packages) 
+# must be restored. Jobs on GitLab.com's Shared Runners are executed on autoscaled machines. 
+# Each machine is used only once (for security reasons) and after that it is removed. 
+# What that means is that before every job a dependency restore must be performed 
+# because restored dependencies are removed along with machines. Fortunately,
+# GitLab provides cache mechanism with the aim of keeping restored dependencies
+# for other jobs. This example shows how to configure cache to pass over restored 
+# dependencies for re-use.
+#
+# With global cache rule, cached dependencies will be downloaded before every job
+# and then unpacked to the paths as specified below.
+cache:
+ # Per-stage and per-branch caching.
+ key: "$CI_JOB_STAGE-$CI_COMMIT_REF_SLUG" 
+ paths:
+  # Specify three paths that should be cached:
+  #
+  # 1) Main JSON file holding information about package dependency tree, packages versions,
+  # frameworks etc. It also holds information where to the dependencies were restored.
+  - '$SOURCE_CODE_PATH$OBJECTS_DIRECTORY/project.assets.json'  
+  # 2) Other NuGet and MSBuild related files. Also needed.
+  - '$SOURCE_CODE_PATH$OBJECTS_DIRECTORY/*.csproj.nuget.*'    
+  # 3) Path to the directory where restored dependencies are kept.
+  - '$NUGET_PACKAGES_DIRECTORY'   
+ # 'pull-push' policy means that latest cache will be downloaded (if exists) 
+ # before executing the job, and a newer version will be uploaded afterwards. 
+ # Such setting saves time when there are no changes in referenced third-party 
+ # packages. For example if you run a pipeline with changes in your code, 
+ # but with no changes within third-party packages which your project is using, 
+ # then project restore will happen in next to no time as all required dependencies 
+ # will already be there — unzipped from cache. 'pull-push' policy is a default 
+ # cache policy, you do not have to specify it explicitly.
+ policy: pull-push 
+
+# ### Restore project dependencies
+#
+# NuGet packages by default are restored to '.nuget/packages' directory 
+# in the user's home directory. That directory is out of scope of GitLab caching. 
+# To get around this a custom path can be specified using '--packages <PATH>' option 
+# for 'dotnet restore' command. In this example a temporary directory is created 
+# in the root of project repository, so it's content can be cached.
+#
+# Learn more about GitLab cache: https://docs.gitlab.com/ee/ci/caching/index.html
+before_script:
+ - 'dotnet restore --packages $NUGET_PACKAGES_DIRECTORY'
+
+build:
+ stage: build
+ # ### Build all projects discovered from solution file. 
+ #
+ # Note: this will fail if you have any projects in your solution that are not 
+ # .NET Core based projects e.g. WCF service, which is based on .NET Framework, 
+ # not .NET Core. In such scenario you will need to build every .NET Core based 
+ # project by explicitly specifying a relative path to the directory 
+ # where it is located e.g. 'dotnet build ./src/ConsoleApp'. 
+ # Only one project path can be passed as a parameter to 'dotnet build' command.
+ script:
+  - 'dotnet build --no-restore' 
+
+tests:
+ stage: test
+ # ### Run the tests
+ #
+ # You can either run tests for all test projects that are defined in your solution 
+ # with 'dotnet test' or run tests only for specific project by specifying
+ # a relative path to the directory where it is located e.g. 'dotnet test ./test/UnitTests'. 
+ #
+ # You may want to define separate testing jobs for different types of testing
+ # e.g. integration tests, unit tests etc.
+ script:
+ - 'dotnet test --no-restore'
diff --git a/lib/gitlab/ci/variables/collection/item.rb b/lib/gitlab/ci/variables/collection/item.rb
index 833aa75adb5..aab10aef398 100644
--- a/lib/gitlab/ci/variables/collection/item.rb
+++ b/lib/gitlab/ci/variables/collection/item.rb
@@ -27,13 +27,9 @@ module Gitlab
           # don't expose `file` attribute at all (stems from what the runner
           # expects).
           #
-          # If the `variable_masking` feature is enabled we expose the `masked`
-          # attribute, otherwise it's not exposed.
-          #
           def to_runner_variable
             @variable.reject do |hash_key, hash_value|
-              (hash_key == :file && hash_value == false) ||
-                (hash_key == :masked && !Feature.enabled?(:variable_masking))
+              hash_key == :file && hash_value == false
             end
           end
 
diff --git a/lib/gitlab/data_builder/deployment.rb b/lib/gitlab/data_builder/deployment.rb
new file mode 100644
index 00000000000..26705dd1f6f
--- /dev/null
+++ b/lib/gitlab/data_builder/deployment.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module DataBuilder
+    module Deployment
+      extend self
+
+      def build(deployment)
+        {
+          object_kind: 'deployment',
+          status: deployment.status,
+          deployable_id: deployment.deployable_id,
+          deployable_url: Gitlab::UrlBuilder.build(deployment.deployable),
+          environment: deployment.environment.name,
+          project: deployment.project.hook_attrs,
+          short_sha: deployment.short_sha,
+          user: deployment.user.hook_attrs,
+          commit_url: Gitlab::UrlBuilder.build(deployment.commit)
+        }
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index c12cb6a6434..55bd77f6c4a 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -118,6 +118,12 @@ module Gitlab
         gitaly_repository_client.exists?
       end
 
+      def create_repository
+        wrapped_gitaly_errors do
+          gitaly_repository_client.create_repository
+        end
+      end
+
       # Returns an Array of branch names
       # sorted by name ASC
       def branch_names
diff --git a/lib/gitlab/git_access.rb b/lib/gitlab/git_access.rb
index cb80ed64eff..4b626509008 100644
--- a/lib/gitlab/git_access.rb
+++ b/lib/gitlab/git_access.rb
@@ -85,7 +85,7 @@ module Gitlab
         check_push_access!
       end
 
-      ::Gitlab::GitAccessResult::Success.new(console_messages: check_for_console_messages(cmd))
+      success_result(cmd)
     end
 
     def guest_can_download_code?
@@ -365,6 +365,10 @@ module Gitlab
 
     protected
 
+    def success_result(cmd)
+      ::Gitlab::GitAccessResult::Success.new(console_messages: check_for_console_messages(cmd))
+    end
+
     def changes_list
       @changes_list ||= Gitlab::ChangesList.new(changes == ANY ? [] : changes)
     end
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index c432317eb24..d34b50c5215 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -31,6 +31,9 @@ module Gitlab
     MAXIMUM_GITALY_CALLS = 30
     CLIENT_NAME = (Sidekiq.server? ? 'gitlab-sidekiq' : 'gitlab-web').freeze
 
+    SERVER_FEATURE_CATFILE_CACHE = 'catfile-cache'.freeze
+    SERVER_FEATURE_FLAGS = [SERVER_FEATURE_CATFILE_CACHE].freeze
+
     MUTEX = Mutex.new
 
     define_histogram :gitaly_controller_action_duration_seconds do
@@ -219,6 +222,7 @@ module Gitlab
       metadata['call_site'] = feature.to_s if feature
       metadata['gitaly-servers'] = address_metadata(remote_storage) if remote_storage
       metadata['x-gitlab-correlation-id'] = Labkit::Correlation::CorrelationId.current_id if Labkit::Correlation::CorrelationId.current_id
+      metadata['gitaly-session-id'] = session_id if feature_enabled?(SERVER_FEATURE_CATFILE_CACHE)
 
       metadata.merge!(server_feature_flags)
 
@@ -235,7 +239,9 @@ module Gitlab
       result
     end
 
-    SERVER_FEATURE_FLAGS = %w[].freeze
+    def self.session_id
+      Gitlab::SafeRequestStore[:gitaly_session_id] ||= SecureRandom.uuid
+    end
 
     def self.server_feature_flags
       SERVER_FEATURE_FLAGS.map do |f|
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml
index ce268793128..c6d4fda4af5 100644
--- a/lib/gitlab/import_export/import_export.yml
+++ b/lib/gitlab/import_export/import_export.yml
@@ -75,6 +75,7 @@ project_tree:
   - :project_badges
   - :ci_cd_settings
   - :error_tracking_setting
+  - :metrics_setting
 
 # Only include the following attributes for the models specified.
 included_attributes:
diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb
index 61a1aa6da5a..e1e70a008d9 100644
--- a/lib/gitlab/import_export/relation_factory.rb
+++ b/lib/gitlab/import_export/relation_factory.rb
@@ -25,7 +25,8 @@ module Gitlab
                     metrics: 'MergeRequest::Metrics',
                     ci_cd_settings: 'ProjectCiCdSetting',
                     error_tracking_setting: 'ErrorTracking::ProjectErrorTrackingSetting',
-                    links: 'Releases::Link' }.freeze
+                    links: 'Releases::Link',
+                    metrics_setting: 'ProjectMetricsSetting' }.freeze
 
       USER_REFERENCES = %w[author_id assignee_id updated_by_id merged_by_id latest_closed_by_id user_id created_by_id last_edited_by_id merge_user_id resolved_by_id closed_by_id].freeze
 
diff --git a/lib/gitlab/metrics/dashboard/processor.rb b/lib/gitlab/metrics/dashboard/processor.rb
new file mode 100644
index 00000000000..cc34ac53051
--- /dev/null
+++ b/lib/gitlab/metrics/dashboard/processor.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Metrics
+    module Dashboard
+      # Responsible for processesing a dashboard hash, inserting
+      # relevant DB records & sorting for proper rendering in
+      # the UI. These includes shared metric info, custom metrics
+      # info, and alerts (only in EE).
+      class Processor
+        SEQUENCE = [
+          Stages::CommonMetricsInserter,
+          Stages::ProjectMetricsInserter,
+          Stages::Sorter
+        ].freeze
+
+        def initialize(project, environment, dashboard)
+          @project = project
+          @environment = environment
+          @dashboard = dashboard
+        end
+
+        # Returns a new dashboard hash with the results of
+        # running transforms on the dashboard.
+        def process
+          @dashboard.deep_symbolize_keys.tap do |dashboard|
+            sequence.each do |stage|
+              stage.new(@project, @environment, dashboard).transform!
+            end
+          end
+        end
+
+        private
+
+        def sequence
+          SEQUENCE
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/metrics/dashboard/service.rb b/lib/gitlab/metrics/dashboard/service.rb
new file mode 100644
index 00000000000..79d563cce4f
--- /dev/null
+++ b/lib/gitlab/metrics/dashboard/service.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# Fetches the metrics dashboard layout and supplemented the output with DB info.
+module Gitlab
+  module Metrics
+    module Dashboard
+      class Service < ::BaseService
+        SYSTEM_DASHBOARD_NAME = 'common_metrics'
+        SYSTEM_DASHBOARD_PATH = Rails.root.join('config', 'prometheus', "#{SYSTEM_DASHBOARD_NAME}.yml")
+
+        # Returns a DB-supplemented json representation of a dashboard config file.
+        def get_dashboard
+          dashboard_string = Rails.cache.fetch(cache_key) { system_dashboard }
+
+          dashboard = process_dashboard(dashboard_string)
+
+          success(dashboard: dashboard)
+        rescue Gitlab::Metrics::Dashboard::Stages::BaseStage::DashboardLayoutError => e
+          error(e.message, :unprocessable_entity)
+        end
+
+        private
+
+        # Returns the base metrics shipped with every GitLab service.
+        def system_dashboard
+          YAML.safe_load(File.read(SYSTEM_DASHBOARD_PATH))
+        end
+
+        def cache_key
+          "metrics_dashboard_#{SYSTEM_DASHBOARD_NAME}"
+        end
+
+        # Returns a new dashboard Hash, supplemented with DB info
+        def process_dashboard(dashboard)
+          Gitlab::Metrics::Dashboard::Processor.new(project, params[:environment], dashboard).process
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/metrics/dashboard/stages/base_stage.rb b/lib/gitlab/metrics/dashboard/stages/base_stage.rb
new file mode 100644
index 00000000000..dd4aae6c115
--- /dev/null
+++ b/lib/gitlab/metrics/dashboard/stages/base_stage.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Metrics
+    module Dashboard
+      module Stages
+        class BaseStage
+          DashboardLayoutError = Class.new(StandardError)
+
+          DEFAULT_PANEL_TYPE = 'area-chart'
+
+          attr_reader :project, :environment, :dashboard
+
+          def initialize(project, environment, dashboard)
+            @project = project
+            @environment = environment
+            @dashboard = dashboard
+          end
+
+          # Entry-point to the stage
+          def transform!
+            raise NotImplementedError
+          end
+
+          protected
+
+          def missing_panel_groups!
+            raise DashboardLayoutError.new('Top-level key :panel_groups must be an array')
+          end
+
+          def missing_panels!
+            raise DashboardLayoutError.new('Each "panel_group" must define an array :panels')
+          end
+
+          def missing_metrics!
+            raise DashboardLayoutError.new('Each "panel" must define an array :metrics')
+          end
+
+          def for_metrics(dashboard)
+            missing_panel_groups! unless dashboard[:panel_groups].is_a?(Array)
+
+            dashboard[:panel_groups].each do |panel_group|
+              missing_panels! unless panel_group[:panels].is_a?(Array)
+
+              panel_group[:panels].each do |panel|
+                missing_metrics! unless panel[:metrics].is_a?(Array)
+
+                panel[:metrics].each do |metric|
+                  yield metric
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/metrics/dashboard/stages/common_metrics_inserter.rb b/lib/gitlab/metrics/dashboard/stages/common_metrics_inserter.rb
new file mode 100644
index 00000000000..3406021bbea
--- /dev/null
+++ b/lib/gitlab/metrics/dashboard/stages/common_metrics_inserter.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Metrics
+    module Dashboard
+      module Stages
+        class CommonMetricsInserter < BaseStage
+          # For each metric in the dashboard config, attempts to
+          # find a corresponding database record. If found,
+          # includes the record's id in the dashboard config.
+          def transform!
+            common_metrics = ::PrometheusMetric.common
+
+            for_metrics(dashboard) do |metric|
+              metric_record = common_metrics.find { |m| m.identifier == metric[:id] }
+              metric[:metric_id] = metric_record.id if metric_record
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/metrics/dashboard/stages/project_metrics_inserter.rb b/lib/gitlab/metrics/dashboard/stages/project_metrics_inserter.rb
new file mode 100644
index 00000000000..221610a14d1
--- /dev/null
+++ b/lib/gitlab/metrics/dashboard/stages/project_metrics_inserter.rb
@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Metrics
+    module Dashboard
+      module Stages
+        class ProjectMetricsInserter < BaseStage
+          # Inserts project-specific metrics into the dashboard
+          # config. If there are no project-specific metrics,
+          # this will have no effect.
+          def transform!
+            project.prometheus_metrics.each do |project_metric|
+              group = find_or_create_panel_group(dashboard[:panel_groups], project_metric)
+              panel = find_or_create_panel(group[:panels], project_metric)
+              find_or_create_metric(panel[:metrics], project_metric)
+            end
+          end
+
+          private
+
+          # Looks for a panel_group corresponding to the
+          # provided metric object. If unavailable, inserts one.
+          # @param panel_groups [Array<Hash>]
+          # @param metric [PrometheusMetric]
+          def find_or_create_panel_group(panel_groups, metric)
+            panel_group = find_panel_group(panel_groups, metric)
+            return panel_group if panel_group
+
+            panel_group = new_panel_group(metric)
+            panel_groups << panel_group
+
+            panel_group
+          end
+
+          # Looks for a panel corresponding to the provided
+          # metric object. If unavailable, inserts one.
+          # @param panels [Array<Hash>]
+          # @param metric [PrometheusMetric]
+          def find_or_create_panel(panels, metric)
+            panel = find_panel(panels, metric)
+            return panel if panel
+
+            panel = new_panel(metric)
+            panels << panel
+
+            panel
+          end
+
+          # Looks for a metric corresponding to the provided
+          # metric object. If unavailable, inserts one.
+          # @param metrics [Array<Hash>]
+          # @param metric [PrometheusMetric]
+          def find_or_create_metric(metrics, metric)
+            target_metric = find_metric(metrics, metric)
+            return target_metric if target_metric
+
+            target_metric = new_metric(metric)
+            metrics << target_metric
+
+            target_metric
+          end
+
+          def find_panel_group(panel_groups, metric)
+            return unless panel_groups
+
+            panel_groups.find { |group| group[:group] == metric.group_title }
+          end
+
+          def find_panel(panels, metric)
+            return unless panels
+
+            panel_identifiers = [DEFAULT_PANEL_TYPE, metric.title, metric.y_label]
+            panels.find { |panel| panel.values_at(:type, :title, :y_label) == panel_identifiers }
+          end
+
+          def find_metric(metrics, metric)
+            return unless metrics
+
+            metrics.find { |m| m[:id] == metric.identifier }
+          end
+
+          def new_panel_group(metric)
+            {
+              group: metric.group_title,
+              priority: metric.priority,
+              panels: []
+            }
+          end
+
+          def new_panel(metric)
+            {
+              type: DEFAULT_PANEL_TYPE,
+              title: metric.title,
+              y_label: metric.y_label,
+              metrics: []
+            }
+          end
+
+          def new_metric(metric)
+            metric.queries.first.merge(metric_id: metric.id)
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/metrics/dashboard/stages/sorter.rb b/lib/gitlab/metrics/dashboard/stages/sorter.rb
new file mode 100644
index 00000000000..ba5aa78059c
--- /dev/null
+++ b/lib/gitlab/metrics/dashboard/stages/sorter.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Metrics
+    module Dashboard
+      module Stages
+        class Sorter < BaseStage
+          def transform!
+            missing_panel_groups! unless dashboard[:panel_groups].is_a? Array
+
+            sort_groups!
+            sort_panels!
+          end
+
+          private
+
+          # Sorts the groups in the dashboard by the :priority key
+          def sort_groups!
+            dashboard[:panel_groups] = dashboard[:panel_groups].sort_by { |group| -group[:priority].to_i }
+          end
+
+          # Sorts the panels in the dashboard by the :weight key
+          def sort_panels!
+            dashboard[:panel_groups].each do |group|
+              missing_panels! unless group[:panels].is_a? Array
+
+              group[:panels] = group[:panels].sort_by { |panel| -panel[:weight].to_i }
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/profiler.rb b/lib/gitlab/profiler.rb
index 28ed587f5c7..890228e5e78 100644
--- a/lib/gitlab/profiler.rb
+++ b/lib/gitlab/profiler.rb
@@ -73,7 +73,7 @@ module Gitlab
 
       result = with_custom_logger(logger) do
         with_user(user) do
-          RubyProf.profile { app.public_send(verb, url, post_data, headers) } # rubocop:disable GitlabSecurity/PublicSend
+          RubyProf.profile { app.public_send(verb, url, params: post_data, headers: headers) } # rubocop:disable GitlabSecurity/PublicSend
         end
       end
 
diff --git a/lib/gitlab/url_builder.rb b/lib/gitlab/url_builder.rb
index f86d599e4cb..169ce8ab026 100644
--- a/lib/gitlab/url_builder.rb
+++ b/lib/gitlab/url_builder.rb
@@ -30,6 +30,8 @@ module Gitlab
         snippet_url(object)
       when Milestone
         milestone_url(object)
+      when ::Ci::Build
+        project_job_url(object.project, object)
       else
         raise NotImplementedError.new("No URL builder defined for #{object.class}")
       end