diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/models/blob.rb | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
download | gitlab-ce-3cccd102ba543e02725d247893729e5c73b38295.tar.gz |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/models/blob.rb')
-rw-r--r-- | app/models/blob.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/blob.rb b/app/models/blob.rb index cc7758d9674..a12d856dc36 100644 --- a/app/models/blob.rb +++ b/app/models/blob.rb @@ -8,6 +8,7 @@ class Blob < SimpleDelegator include BlobActiveModel MODE_SYMLINK = '120000' # The STRING 120000 is the git-reported octal filemode for a symlink + MODE_EXECUTABLE = '100755' # The STRING 100755 is the git-reported octal filemode for an executable file CACHE_TIME = 60 # Cache raw blobs referred to by a (mutable) ref for 1 minute CACHE_TIME_IMMUTABLE = 3600 # Cache blobs referred to by an immutable reference for 1 hour @@ -35,7 +36,6 @@ class Blob < SimpleDelegator BlobViewer::Image, BlobViewer::Sketch, - BlobViewer::Balsamiq, BlobViewer::Video, BlobViewer::Audio, @@ -182,6 +182,10 @@ class Blob < SimpleDelegator mode == MODE_SYMLINK end + def executable? + mode == MODE_EXECUTABLE + end + def extension @extension ||= extname.downcase.delete('.') end |