diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-19 17:16:28 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-19 17:16:28 +0300 |
commit | e4384360a16dd9a19d4d2d25d0ef1f2b862ed2a6 (patch) | |
tree | 2fcdfa7dcdb9db8f5208b2562f4b4e803d671243 /app/presenters/ci/pipeline_presenter.rb | |
parent | ffda4e7bcac36987f936b4ba515995a6698698f0 (diff) |
Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42
Diffstat (limited to 'app/presenters/ci/pipeline_presenter.rb')
-rw-r--r-- | app/presenters/ci/pipeline_presenter.rb | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/app/presenters/ci/pipeline_presenter.rb b/app/presenters/ci/pipeline_presenter.rb index 3aba5a2c7ed..762ee0d92cd 100644 --- a/app/presenters/ci/pipeline_presenter.rb +++ b/app/presenters/ci/pipeline_presenter.rb @@ -65,28 +65,6 @@ module Ci '%.2f' % pipeline.coverage end - def ref_text_legacy - if pipeline.detached_merge_request_pipeline? - _("for %{link_to_merge_request} with %{link_to_merge_request_source_branch}") - .html_safe % { - link_to_merge_request: link_to_merge_request, - link_to_merge_request_source_branch: link_to_merge_request_source_branch - } - elsif pipeline.merged_result_pipeline? - _("for %{link_to_merge_request} with %{link_to_merge_request_source_branch} into %{link_to_merge_request_target_branch}") - .html_safe % { - link_to_merge_request: link_to_merge_request, - link_to_merge_request_source_branch: link_to_merge_request_source_branch, - link_to_merge_request_target_branch: link_to_merge_request_target_branch - } - elsif pipeline.ref && pipeline.ref_exists? - _("for %{link_to_pipeline_ref}") - .html_safe % { link_to_pipeline_ref: link_to_pipeline_ref } - elsif pipeline.ref - _("for %{ref}").html_safe % { ref: plain_ref_name } - end - end - def ref_text if pipeline.detached_merge_request_pipeline? _("Related merge request %{link_to_merge_request} to merge %{link_to_merge_request_source_branch}") @@ -109,22 +87,6 @@ module Ci end end - def all_related_merge_request_text(limit: nil) - if all_related_merge_requests.none? - _("No related merge requests found.") - else - (_("%{count} related %{pluralized_subject}: %{links}") % { - count: all_related_merge_requests.count, - pluralized_subject: n_('merge request', 'merge requests', all_related_merge_requests.count), - links: all_related_merge_request_links(limit: limit).join(', ') - }).html_safe - end - end - - def has_many_merge_requests? - all_related_merge_requests.count > 1 - end - def link_to_pipeline_ref ApplicationController.helpers.link_to(pipeline.ref, project_commits_path(pipeline.project, pipeline.ref), |