diff options
author | Bob Van Landuyt <bob@gitlab.com> | 2017-03-16 10:53:48 +0100 |
---|---|---|
committer | Bob Van Landuyt <bob@gitlab.com> | 2017-03-16 12:31:27 +0100 |
commit | 7d5b8993f47f02488cb37811719193d4ecb45e0a (patch) | |
tree | 7b63b3281729273c5ebec61dae064e47f87c6bb1 /app/helpers | |
parent | 901e70fba1042acd19feeb278312365754e7d763 (diff) | |
download | gitlab-ce-7d5b8993f47f02488cb37811719193d4ecb45e0a.tar.gz |
Build project cache key in a helper27376-cache-default-branch-pipeline-on-project
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/ci_status_helper.rb | 4 | ||||
-rw-r--r-- | app/helpers/projects_helper.rb | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb index a91d19dc347..2de9e0de310 100644 --- a/app/helpers/ci_status_helper.rb +++ b/app/helpers/ci_status_helper.rb @@ -59,6 +59,10 @@ module CiStatusHelper custom_icon(icon_name) end + def pipeline_status_cache_key(pipeline_status) + "pipeline-status/#{pipeline_status.sha}-#{pipeline_status.status}" + end + def render_project_pipeline_status(pipeline_status, tooltip_placement: 'auto left') project = pipeline_status.project path = pipelines_namespace_project_commit_path( diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 4befeacc135..bd0c2cd661e 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -159,6 +159,13 @@ module ProjectsHelper choose a GitLab CI Yaml template and commit your changes. #{link_to_autodeploy_doc}".html_safe end + def project_list_cache_key(project) + key = [project.namespace.cache_key, project.cache_key, controller.controller_name, controller.action_name, current_application_settings.cache_key, 'v2.3'] + key << pipeline_status_cache_key(project.pipeline_status) if project.pipeline_status.has_status? + + key + end + private def repo_children_classes(field) |