diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-09-01 09:56:46 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-09-01 09:56:46 +0000 |
| commit | 433d8a10c1d1259a61e59a8368db08d7d6b58c62 (patch) | |
| tree | 3c85d3d61af566ff5c0ddcb0c1eaed600a3914ed | |
| parent | 3aa045c443152479614cb4cf9a848ce5dc582356 (diff) | |
| parent | 52ab33a3fa1bd31e8e01ea8b9c89d8c08dbeff82 (diff) | |
| download | gitlab-ce-433d8a10c1d1259a61e59a8368db08d7d6b58c62.tar.gz | |
Merge branch 'expire-commit-info-partials-sooner' into 'master'
Expire commit view partial after a day
See merge request !6128
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/commits/_commit.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 9837b2edb9d..1ce51e3a2ad 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -37,6 +37,7 @@ v 8.12.0 (unreleased) - Added tests for diff notes - Add a button to download latest successful artifacts for branches and tags !5142 - Remove redundant pipeline tooltips (ClemMakesApps) + - Expire commit info views after one day, instead of two weeks, to allow for user email updates - Add delimiter to project stars and forks count (ClemMakesApps) - Fix badge count alignment (ClemMakesApps) - Fix repo title alignment (ClemMakesApps) diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index fd888f41b1e..389477d0927 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -7,7 +7,7 @@ - cache_key = [project.path_with_namespace, commit.id, current_application_settings, note_count] - cache_key.push(commit.status) if commit.status -= cache(cache_key) do += cache(cache_key, expires_in: 1.day) do %li.commit.js-toggle-container{ id: "commit-#{commit.short_id}" } = author_avatar(commit, size: 36) |