diff options
author | Valery Sizov <valery@gitlab.com> | 2015-07-23 10:45:37 +0300 |
---|---|---|
committer | Valery Sizov <valery@gitlab.com> | 2015-07-23 10:45:37 +0300 |
commit | db69c7325ce0fb160dbfc0716dcc09e02750b354 (patch) | |
tree | 1a8dfcbf275da06d492f05103e79ed4f05679548 | |
parent | 6ae806b1dfbc074e4feab82d64b4b343bf111d58 (diff) | |
parent | 6454bcbfa4bee56b53ff4e17f9e18ecc00ecbbd5 (diff) |
Merge branch 'label_caching' into 'master'
Revert cache issue
It reverts https://dev.gitlab.org/gitlab/gitlabhq/commit/40e31e1db31e6ba9a1cd6255afc2f09df61f4060
and fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/2048
and https://gitlab.com/gitlab-org/gitlab-ce/issues/2043
See merge request !1028
-rw-r--r-- | CHANGELOG | 3 | ||||
-rw-r--r-- | app/views/projects/issues/_issue.html.haml | 73 |
2 files changed, 39 insertions, 37 deletions
diff --git a/CHANGELOG b/CHANGELOG index 2765923124f..1ba9d9f308c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,9 @@ v 7.14.0 (unreleased) - Add support for destroying project milestones (Stan Hu) - Add fetch command to the MR page. +v 7.13.1 + - Revert issue caching + v 7.13.0 (unreleased) - Remove repository graph log to fix slow cache updates after push event (Stan Hu) - Only enable HSTS header for HTTPS and port 443 (Stan Hu) diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index 1b45bb1af0c..b6910c8f796 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.html.haml @@ -3,43 +3,42 @@ .issue-check = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue" - = cache issue do - .issue-title - %span.issue-title-text - = link_to_gfm issue.title, issue_path(issue), class: "row_title" - .issue-labels - - issue.labels.each do |label| - = link_to_label(label, project: issue.project) - .pull-right.light - - if issue.closed? - %span - CLOSED - - if issue.assignee - = link_to_member(@project, issue.assignee, name: false) - - note_count = issue.notes.user.count - - if note_count > 0 - - %span - %i.fa.fa-comments - = note_count - - else - - %span.issue-no-comments - %i.fa.fa-comments - = 0 - - .issue-info - = "#{issue.to_reference} opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')} by #{link_to_member(@project, issue.author, avatar: false)}".html_safe - - if issue.votes_count > 0 - = render 'votes/votes_inline', votable: issue - - if issue.milestone + .issue-title + %span.issue-title-text + = link_to_gfm issue.title, issue_path(issue), class: "row_title" + .issue-labels + - issue.labels.each do |label| + = link_to_label(label, project: issue.project) + .pull-right.light + - if issue.closed? + %span + CLOSED + - if issue.assignee + = link_to_member(@project, issue.assignee, name: false) + - note_count = issue.notes.user.count + - if note_count > 0 %span - %i.fa.fa-clock-o - = issue.milestone.title - - if issue.tasks? - %span.task-status - = issue.task_status + %i.fa.fa-comments + = note_count + - else + + %span.issue-no-comments + %i.fa.fa-comments + = 0 + + .issue-info + = "#{issue.to_reference} opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')} by #{link_to_member(@project, issue.author, avatar: false)}".html_safe + - if issue.votes_count > 0 + = render 'votes/votes_inline', votable: issue + - if issue.milestone + + %span + %i.fa.fa-clock-o + = issue.milestone.title + - if issue.tasks? + %span.task-status + = issue.task_status - .pull-right.issue-updated-at - %small updated #{time_ago_with_tooltip(issue.updated_at, placement: 'bottom', html_class: 'issue_update_ago')} + .pull-right.issue-updated-at + %small updated #{time_ago_with_tooltip(issue.updated_at, placement: 'bottom', html_class: 'issue_update_ago')} |