diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-07-25 17:08:36 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-07-26 10:22:17 +0200 |
| commit | 939436480c8c6bd524d3c4c78674e81f90861d06 (patch) | |
| tree | 8b9dd288e6b0ddf31247b535833c23f74f3da2ea /app/models | |
| parent | 4bf20d677b2ec3bffae9fe2ca1abbbc0429b6b28 (diff) | |
| download | gitlab-ce-939436480c8c6bd524d3c4c78674e81f90861d06.tar.gz | |
Ensure relative paths for video are rewritten as we do for images20189-markdown-video-doesn-t-work-when-the-referenced-video-file-is-in-same-repo
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/blob.rb | 4 | ||||
| -rw-r--r-- | app/models/commit.rb | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/models/blob.rb b/app/models/blob.rb index 4279ea2ce57..0df2805e448 100644 --- a/app/models/blob.rb +++ b/app/models/blob.rb @@ -31,6 +31,10 @@ class Blob < SimpleDelegator text? && language && language.name == 'SVG' end + def video? + UploaderHelper::VIDEO_EXT.include?(extname.downcase.delete('.')) + end + def to_partial_path if lfs_pointer? 'download' diff --git a/app/models/commit.rb b/app/models/commit.rb index 2ef3973c160..f80f1063406 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -295,8 +295,8 @@ class Commit def uri_type(path) entry = @raw.tree.path(path) if entry[:type] == :blob - blob = Gitlab::Git::Blob.new(name: entry[:name]) - blob.image? ? :raw : :blob + blob = ::Blob.decorate(Gitlab::Git::Blob.new(name: entry[:name])) + blob.image? || blob.video? ? :raw : :blob else entry[:type] end |