diff options
author | Mike Lewis <mlewis@gitlab.com> | 2019-02-18 21:38:24 +0000 |
---|---|---|
committer | Mike Lewis <mlewis@gitlab.com> | 2019-02-18 21:38:24 +0000 |
commit | 07c32a0df5306082fe800de1ae6e2c51325f46ef (patch) | |
tree | 2d810bcd76a993ac71224de5b5f0b6a7707127df /lib/gitlab/diff/file.rb | |
parent | f1645c744fcf8677ae14714914c4c4ffb9d5b17e (diff) | |
parent | fe10964a6884162b9272ec3a32a5736c2a997ab2 (diff) | |
download | gitlab-ce-07c32a0df5306082fe800de1ae6e2c51325f46ef.tar.gz |
Merge branch 'master' into 'template-improvements-for-documentation'
# Conflicts:
# .gitlab/merge_request_templates/Documentation.md
Diffstat (limited to 'lib/gitlab/diff/file.rb')
-rw-r--r-- | lib/gitlab/diff/file.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/diff/file.rb b/lib/gitlab/diff/file.rb index e410d5a8333..c9d89d56884 100644 --- a/lib/gitlab/diff/file.rb +++ b/lib/gitlab/diff/file.rb @@ -293,6 +293,10 @@ module Gitlab end end + def viewer + rich_viewer || simple_viewer + end + def simple_viewer @simple_viewer ||= simple_viewer_class.new(self) end |