summaryrefslogtreecommitdiff
path: root/app/views/discussions
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-02 15:09:08 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-02 15:09:08 +0000
commit840d5ecdbbf8da3e03a7f0b8b465a89d1519807c (patch)
tree4e197815c026a947057f7b5cbcb5e3cf106cc22f /app/views/discussions
parentb0107e8756bf3287f8a6221252c800209a9c46f6 (diff)
downloadgitlab-ce-840d5ecdbbf8da3e03a7f0b8b465a89d1519807c.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/discussions')
-rw-r--r--app/views/discussions/_discussion.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml
index 9659d416a38..4a27284cbae 100644
--- a/app/views/discussions/_discussion.html.haml
+++ b/app/views/discussions/_discussion.html.haml
@@ -37,7 +37,7 @@
an outdated change in
commit
- %span.commit-sha= Commit.truncate_sha(discussion.commit_id)
+ %span.commit-sha= truncate_sha(discussion.commit_id)
- else
- unless discussion.active?
an old version of