diff options
Diffstat (limited to 'app/presenters')
| -rw-r--r-- | app/presenters/commit_status_presenter.rb | 3 | ||||
| -rw-r--r-- | app/presenters/packages/detail/package_presenter.rb | 4 | ||||
| -rw-r--r-- | app/presenters/packages/pypi/package_presenter.rb | 43 | ||||
| -rw-r--r-- | app/presenters/project_presenter.rb | 2 | ||||
| -rw-r--r-- | app/presenters/release_presenter.rb | 14 |
5 files changed, 36 insertions, 30 deletions
diff --git a/app/presenters/commit_status_presenter.rb b/app/presenters/commit_status_presenter.rb index 8ef6e2b7962..e62e2fac835 100644 --- a/app/presenters/commit_status_presenter.rb +++ b/app/presenters/commit_status_presenter.rb @@ -25,7 +25,8 @@ class CommitStatusPresenter < Gitlab::View::Presenter::Delegated reached_max_descendant_pipelines_depth: 'You reached the maximum depth of child pipelines', project_deleted: 'The job belongs to a deleted project', user_blocked: 'The user who created this job is blocked', - ci_quota_exceeded: 'No more CI minutes available' + ci_quota_exceeded: 'No more CI minutes available', + no_matching_runner: 'No matching runner available' }.freeze private_constant :CALLOUT_FAILURE_MESSAGES diff --git a/app/presenters/packages/detail/package_presenter.rb b/app/presenters/packages/detail/package_presenter.rb index 4fa207b1205..59e50b96ab2 100644 --- a/app/presenters/packages/detail/package_presenter.rb +++ b/app/presenters/packages/detail/package_presenter.rb @@ -46,8 +46,8 @@ module Packages size: package_file.size, file_md5: package_file.file_md5, file_sha1: package_file.file_sha1, - file_sha256: package_file.file_sha256 - + file_sha256: package_file.file_sha256, + id: package_file.id } file_view[:pipelines] = build_pipeline_infos(package_file.pipelines) if package_file.pipelines.present? diff --git a/app/presenters/packages/pypi/package_presenter.rb b/app/presenters/packages/pypi/package_presenter.rb index 1cb11c7be1a..7997c1b9b79 100644 --- a/app/presenters/packages/pypi/package_presenter.rb +++ b/app/presenters/packages/pypi/package_presenter.rb @@ -7,9 +7,9 @@ module Packages class PackagePresenter include API::Helpers::RelatedResourcesHelpers - def initialize(packages, project) + def initialize(packages, project_or_group) @packages = packages - @project = project + @project_or_group = project_or_group end # Returns the HTML body for PyPI simple API. @@ -51,16 +51,27 @@ module Packages end def build_pypi_package_path(file) - expose_url( - api_v4_projects_packages_pypi_files_file_identifier_path( - { - id: @project.id, - sha256: file.file_sha256, - file_identifier: file.file_name - }, - true - ) - ) + "#sha256=#{file.file_sha256}" + params = { + id: @project_or_group.id, + sha256: file.file_sha256, + file_identifier: file.file_name + } + + if project? + expose_url( + api_v4_projects_packages_pypi_files_file_identifier_path( + params, true + ) + ) + "#sha256=#{file.file_sha256}" + elsif group? + expose_url( + api_v4_groups___packages_pypi_files_file_identifier_path( + params, true + ) + ) + "#sha256=#{file.file_sha256}" + else + '' + end end def name @@ -70,6 +81,14 @@ module Packages def escape(str) ERB::Util.html_escape(str) end + + def project? + @project_or_group.is_a?(::Project) + end + + def group? + @project_or_group.is_a?(::Group) + end end end end diff --git a/app/presenters/project_presenter.rb b/app/presenters/project_presenter.rb index 4f803ba34f4..fcd3189296a 100644 --- a/app/presenters/project_presenter.rb +++ b/app/presenters/project_presenter.rb @@ -264,7 +264,7 @@ class ProjectPresenter < Gitlab::View::Presenter::Delegated 'original_branch' => default_branch_or_main, 'can_push_code' => 'true', 'path' => project_create_blob_path(project, default_branch_or_main), - 'project_path' => project.path + 'project_path' => project.full_path } ) end diff --git a/app/presenters/release_presenter.rb b/app/presenters/release_presenter.rb index aa6429ab012..ac27e997b41 100644 --- a/app/presenters/release_presenter.rb +++ b/app/presenters/release_presenter.rb @@ -26,32 +26,22 @@ class ReleasePresenter < Gitlab::View::Presenter::Delegated end def opened_merge_requests_url - return unless release_mr_issue_urls_available? - project_merge_requests_url(project, params_for_issues_and_mrs) end def merged_merge_requests_url - return unless release_mr_issue_urls_available? - project_merge_requests_url(project, params_for_issues_and_mrs(state: 'merged')) end def closed_merge_requests_url - return unless release_mr_issue_urls_available? - project_merge_requests_url(project, params_for_issues_and_mrs(state: 'closed')) end def opened_issues_url - return unless release_mr_issue_urls_available? - project_issues_url(project, params_for_issues_and_mrs) end def closed_issues_url - return unless release_mr_issue_urls_available? - project_issues_url(project, params_for_issues_and_mrs(state: 'closed')) end @@ -89,10 +79,6 @@ class ReleasePresenter < Gitlab::View::Presenter::Delegated { scope: 'all', state: state, release_tag: release.tag } end - def release_mr_issue_urls_available? - ::Feature.enabled?(:release_mr_issue_urls, project, default_enabled: true) - end - def release_edit_page_available? can?(current_user, :update_release, release) end |