diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-06 17:11:36 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-06 17:11:36 +0000 |
| commit | cc01aa4fd59ed0401d4c9e1526e3ac6ddd866e53 (patch) | |
| tree | f926b1b7fcb26527bb55940fda2a017314fd3c01 /app/models/blob.rb | |
| parent | eb7bdeb5c8619b61181a9348c7aa94a2be1615bb (diff) | |
| parent | 2e6201b13197d03eafecd18d967ba7d55f664e19 (diff) | |
| download | gitlab-ce-enable-auto-cancelling-by-default.tar.gz | |
Merge branch 'master' into 'enable-auto-cancelling-by-default'enable-auto-cancelling-by-default
# Conflicts:
# spec/workers/post_receive_spec.rb
Diffstat (limited to 'app/models/blob.rb')
| -rw-r--r-- | app/models/blob.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/blob.rb b/app/models/blob.rb index a4fae22a0c4..eaf0b713122 100644 --- a/app/models/blob.rb +++ b/app/models/blob.rb @@ -26,6 +26,7 @@ class Blob < SimpleDelegator BlobViewer::Image, BlobViewer::Sketch, + BlobViewer::Balsamiq, BlobViewer::Video, |