diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-11 08:26:05 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-11 08:26:05 +0000 |
| commit | 1c75e4e6a0e7a0dbcce679998fb7e3d45b9a25b7 (patch) | |
| tree | dedc925b0216207973a97ba871a9db9396ead407 /app/controllers | |
| parent | 4067dd4f84681dd109fb8e1957b6327b4db20193 (diff) | |
| parent | 909975051369f57278000acb7cddc7b0dafc9906 (diff) | |
| download | gitlab-ce-1c75e4e6a0e7a0dbcce679998fb7e3d45b9a25b7.tar.gz | |
Merge branch 'dm-auxiliary-viewers' into 'master'
Implement auxiliary blob viewers
See merge request !11195
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/renders_blob.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/concerns/renders_blob.rb b/app/controllers/concerns/renders_blob.rb index 9faf68e6d97..4a6630dfd90 100644 --- a/app/controllers/concerns/renders_blob.rb +++ b/app/controllers/concerns/renders_blob.rb @@ -3,8 +3,11 @@ module RendersBlob def render_blob_json(blob) viewer = - if params[:viewer] == 'rich' + case params[:viewer] + when 'rich' blob.rich_viewer + when 'auxiliary' + blob.auxiliary_viewer else blob.simple_viewer end |