diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-30 11:13:49 +0100 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-04-30 11:13:49 +0100 |
commit | 759f102df09a7877ae68ab05b87d3a434f588067 (patch) | |
tree | e5f002acff468f5e84ade40c31e5e4b991899f1e /app/models/blob.rb | |
parent | adff7923ca3088df9e07ccd60d6f9fa24fbdbfc5 (diff) | |
parent | 03f13af588cf2b578a27717db492c216fcafbf9a (diff) | |
download | gitlab-ce-759f102df09a7877ae68ab05b87d3a434f588067.tar.gz |
Merge branch 'master' into balsalmiq-support
Diffstat (limited to 'app/models/blob.rb')
-rw-r--r-- | app/models/blob.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/blob.rb b/app/models/blob.rb index 1694f4e6dc9..934dd2b9a4f 100644 --- a/app/models/blob.rb +++ b/app/models/blob.rb @@ -28,6 +28,8 @@ class Blob < SimpleDelegator BlobViewer::Sketch, BlobViewer::Balsamiq, + BlobViewer::Video, + BlobViewer::PDF, BlobViewer::BinarySTL, |