Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

9 files changed, 56 insertions, 57 deletions

diff --git a/app/presenters/blob_presenter.rb b/app/presenters/blob_presenter.rb
index 2dcc6cd5df3..74ac47fa439 100644
--- a/app/presenters/blob_presenter.rb
+++ b/app/presenters/blob_presenter.rb
@@ -69,7 +69,7 @@ class BlobPresenter < Gitlab::View::Presenter::Delegated
   end
 
   def find_file_path
-    url_helpers.project_find_file_path(project, ref_qualified_path)
+    url_helpers.project_find_file_path(project, blob.commit_id)
   end
 
   def blame_path
diff --git a/app/presenters/ci/build_presenter.rb b/app/presenters/ci/build_presenter.rb
index 0be684901d5..513fcd90cf8 100644
--- a/app/presenters/ci/build_presenter.rb
+++ b/app/presenters/ci/build_presenter.rb
@@ -4,16 +4,6 @@ module Ci
   class BuildPresenter < ProcessablePresenter
     presents ::Ci::Build, as: :build
 
-    def erased_by_user?
-      # Build can be erased through API, therefore it does not have
-      # `erased_by` user assigned in that case.
-      erased? && erased_by
-    end
-
-    def erased_by_name
-      erased_by.name if erased_by_user?
-    end
-
     def status_title(status = detailed_status)
       if auto_canceled?
         "Job is redundant and is auto-canceled by Pipeline ##{auto_canceled_by_id}"
@@ -33,10 +23,6 @@ module Ci
         end
     end
 
-    def tooltip_message
-      "#{build.name} - #{detailed_status.status_tooltip}"
-    end
-
     def execute_in
       scheduled? && scheduled_at && [0, scheduled_at - Time.now].max
     end
diff --git a/app/presenters/ci/legacy_stage_presenter.rb b/app/presenters/ci/legacy_stage_presenter.rb
deleted file mode 100644
index c803abfab6a..00000000000
--- a/app/presenters/ci/legacy_stage_presenter.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Ci
-  class LegacyStagePresenter < Gitlab::View::Presenter::Delegated
-    presents ::Ci::LegacyStage, as: :legacy_stage
-
-    def latest_ordered_statuses
-      preload_statuses(legacy_stage.statuses.latest_ordered)
-    end
-
-    def retried_ordered_statuses
-      preload_statuses(legacy_stage.statuses.retried_ordered)
-    end
-
-    private
-
-    def preload_statuses(statuses)
-      Preloaders::CommitStatusPreloader.new(statuses).execute(Ci::StagePresenter::PRELOADED_RELATIONS)
-
-      statuses
-    end
-  end
-end
diff --git a/app/presenters/clusters/cluster_presenter.rb b/app/presenters/clusters/cluster_presenter.rb
index 454e5c0e44a..ec1dc96c2e3 100644
--- a/app/presenters/clusters/cluster_presenter.rb
+++ b/app/presenters/clusters/cluster_presenter.rb
@@ -52,16 +52,6 @@ module Clusters
       end
     end
 
-    def gitlab_managed_apps_logs_path
-      return unless logs_project && can_read_cluster?
-
-      if cluster.elastic_stack_adapter&.available?
-        elasticsearch_project_logs_path(logs_project, cluster_id: cluster.id, format: :json)
-      else
-        k8s_project_logs_path(logs_project, cluster_id: cluster.id, format: :json)
-      end
-    end
-
     def read_only_kubernetes_platform_fields?
       !cluster.provided_by_user?
     end
diff --git a/app/presenters/clusters/integration_presenter.rb b/app/presenters/clusters/integration_presenter.rb
index f7be59f00f3..af735e1c18b 100644
--- a/app/presenters/clusters/integration_presenter.rb
+++ b/app/presenters/clusters/integration_presenter.rb
@@ -2,7 +2,7 @@
 
 module Clusters
   class IntegrationPresenter < Gitlab::View::Presenter::Delegated
-    presents ::Clusters::Integrations::Prometheus, ::Clusters::Integrations::ElasticStack, as: :integration
+    presents ::Clusters::Integrations::Prometheus, as: :integration
 
     def application_type
       integration.class.name.demodulize.underscore
diff --git a/app/presenters/commit_status_presenter.rb b/app/presenters/commit_status_presenter.rb
index 675288da35b..815a4da25ab 100644
--- a/app/presenters/commit_status_presenter.rb
+++ b/app/presenters/commit_status_presenter.rb
@@ -16,8 +16,11 @@ class CommitStatusPresenter < Gitlab::View::Presenter::Delegated
     data_integrity_failure: 'There has been a structural integrity problem detected, please contact system administrator',
     forward_deployment_failure: 'The deployment job is older than the previously succeeded deployment job, and therefore cannot be run',
     pipeline_loop_detected: 'This job could not be executed because it would create infinitely looping pipelines',
+    insufficient_upstream_permissions: 'This job could not be executed because of insufficient permissions to track the upstream project.',
+    upstream_bridge_project_not_found: 'This job could not be executed because upstream bridge project could not be found.',
     invalid_bridge_trigger: 'This job could not be executed because downstream pipeline trigger definition is invalid',
     downstream_bridge_project_not_found: 'This job could not be executed because downstream bridge project could not be found',
+    protected_environment_failure: 'The environment this job is deploying to is protected. Only users with permission may successfully run this job.',
     insufficient_bridge_permissions: 'This job could not be executed because of insufficient permissions to create a downstream pipeline',
     bridge_pipeline_is_child_pipeline: 'This job belongs to a child pipeline and cannot create further child pipelines',
     downstream_pipeline_creation_failed: 'The downstream pipeline could not be created',
@@ -62,5 +65,3 @@ class CommitStatusPresenter < Gitlab::View::Presenter::Delegated
     ActionController::Base.helpers.link_to('How do I fix it?', help_page_path(path, anchor: anchor))
   end
 end
-
-CommitStatusPresenter.prepend_mod_with('CommitStatusPresenter')
diff --git a/app/presenters/gitlab/blame_presenter.rb b/app/presenters/gitlab/blame_presenter.rb
index 81a954761ea..6230e61d2be 100644
--- a/app/presenters/gitlab/blame_presenter.rb
+++ b/app/presenters/gitlab/blame_presenter.rb
@@ -66,7 +66,7 @@ module Gitlab
       previous_commit_id = commit.parent_id
       return unless previous_commit_id && !previous_path.nil?
 
-      link_to project_blame_path(project, tree_join(previous_commit_id, previous_path)),
+      link_to project_blame_path(project, tree_join(previous_commit_id, previous_path), page: page),
         title: _('View blame prior to this change'),
         aria: { label: _('View blame prior to this change') },
         class: 'version-link',
diff --git a/app/presenters/invitation_presenter.rb b/app/presenters/invitation_presenter.rb
deleted file mode 100644
index ada8227a477..00000000000
--- a/app/presenters/invitation_presenter.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-class InvitationPresenter < Gitlab::View::Presenter::Delegated
-  presents nil, as: :invitation
-end
diff --git a/app/presenters/terraform/module_version_presenter.rb b/app/presenters/terraform/module_version_presenter.rb
new file mode 100644
index 00000000000..776a4d8ab82
--- /dev/null
+++ b/app/presenters/terraform/module_version_presenter.rb
@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Terraform
+  class ModuleVersionPresenter < Gitlab::View::Presenter::Simple
+    attr_accessor :package, :system
+
+    def initialize(package, system)
+      @package = package
+      @system = system
+    end
+
+    def name
+      package.name
+    end
+
+    def provider
+      system
+    end
+
+    def providers
+      [
+        provider
+      ]
+    end
+
+    def root
+      {
+        'dependencies' => []
+      }
+    end
+
+    def source
+      package&.project&.web_url
+    end
+
+    def submodules
+      []
+    end
+
+    def version
+      package.version
+    end
+
+    def versions
+      [
+        version
+      ]
+    end
+  end
+end