summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authormicael.bergeron <micaelbergeron@gmail.com>2017-11-20 09:02:01 -0500
committermicael.bergeron <micaelbergeron@gmail.com>2017-12-07 09:01:27 -0500
commit3d8fbd12b8f234aa62f4b5ceed21076a7afbcd23 (patch)
tree605b07654f65bb07c34b6d88a77b57f9b4b0b229 /app/views
parent6b3f0fee151283348b44a69342ec1a6738cd2de0 (diff)
downloadgitlab-ce-3d8fbd12b8f234aa62f4b5ceed21076a7afbcd23.tar.gz
add support for commit (in mr) to reference filter
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/commits/_commit.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml
index 45b4ef12ec9..8c28becf471 100644
--- a/app/views/projects/commits/_commit.html.haml
+++ b/app/views/projects/commits/_commit.html.haml
@@ -4,7 +4,7 @@
- ref = local_assigns.fetch(:ref) { merge_request&.source_branch }
- link = commit_path(project, commit, merge_request: merge_request)
-- cache_key = [project.full_path, commit.id, current_application_settings, @path.presence, current_controller?(:commits), merge_request.iid, view_details, I18n.locale]
+- cache_key = [project.full_path, commit.id, current_application_settings, @path.presence, current_controller?(:commits), merge_request&.iid, view_details, I18n.locale]
- cache_key.push(commit.status(ref)) if commit.status(ref)
= cache(cache_key, expires_in: 1.day) do