diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-05-21 12:33:43 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-05-21 12:33:43 +0000 |
| commit | e1625a3bf0a6f7b907876932dcc2b0bda3fe140f (patch) | |
| tree | 2abf745a68bba239b9aacb3e5b8afd46dda55ed5 | |
| parent | d43fd46c678ddd96f68beeeebbf1b6d5e4a85a86 (diff) | |
| parent | 9bb2f02db63daf6901298564475da82533748f56 (diff) | |
| download | gitlab-ce-e1625a3bf0a6f7b907876932dcc2b0bda3fe140f.tar.gz | |
Merge branch 'mc-make-diff-content-partial-use-model-method' into 'master'
Makes 'diff/content' partial use instance method
See merge request gitlab-org/gitlab-ce!28500
| -rw-r--r-- | app/views/projects/diffs/_content.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/diffs/_content.html.haml b/app/views/projects/diffs/_content.html.haml index 68f74f702ea..590fcdb0234 100644 --- a/app/views/projects/diffs/_content.html.haml +++ b/app/views/projects/diffs/_content.html.haml @@ -1,2 +1,2 @@ .diff-content - = render 'projects/diffs/viewer', viewer: diff_file.rich_viewer || diff_file.simple_viewer + = render 'projects/diffs/viewer', viewer: diff_file.viewer |