diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-14 13:07:43 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-14 13:07:43 +0000 |
| commit | 270e15f1538fe2b325dbb9bdcf58b622c2a4e86d (patch) | |
| tree | 178ab419ac8f9355668297e3753282fcaf8ef248 | |
| parent | b3eda944454cb180cdefb8ddff35fdeb729e3ed5 (diff) | |
| parent | 6bffc17f7d04f6ecd99d896ed299060724032a3b (diff) | |
| download | gitlab-ce-270e15f1538fe2b325dbb9bdcf58b622c2a4e86d.tar.gz | |
Merge branch 'fix/gb/dashboard-commit-status-caching' into 'master'
Improve fragment caching rules at projects dashboard
Closes #28364
See merge request !9895
| -rw-r--r-- | app/views/shared/projects/_project.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-gb-dashboard-commit-status-caching.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/views/shared/projects/_project.html.haml b/app/views/shared/projects/_project.html.haml index 4a27965754d..7e9fb7bb4d3 100644 --- a/app/views/shared/projects/_project.html.haml +++ b/app/views/shared/projects/_project.html.haml @@ -7,7 +7,7 @@ - show_last_commit_as_description = false unless local_assigns[:show_last_commit_as_description] == true && project.commit - css_class += " no-description" if project.description.blank? && !show_last_commit_as_description - cache_key = [project.namespace, project, controller.controller_name, controller.action_name, current_application_settings, 'v2.3'] -- cache_key.push(project.commit.status) if project.commit.try(:status) +- cache_key.push(project.commit&.sha, project.commit&.status) %li.project-row{ class: css_class } = cache(cache_key) do diff --git a/changelogs/unreleased/fix-gb-dashboard-commit-status-caching.yml b/changelogs/unreleased/fix-gb-dashboard-commit-status-caching.yml new file mode 100644 index 00000000000..4db684c40b2 --- /dev/null +++ b/changelogs/unreleased/fix-gb-dashboard-commit-status-caching.yml @@ -0,0 +1,4 @@ +--- +title: Resolve project pipeline status caching problem on dashboard +merge_request: 9895 +author: |