diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-08 13:01:53 -0600 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-08 13:01:53 -0600 |
| commit | a2b80c89d8b6b38eb1f5c59109006ea48a2e9e5a (patch) | |
| tree | 2d22d33ab68a57d4c934f0c44b43621f482cb192 /app/models/commit.rb | |
| parent | 65791c9c2a234685e297e334dd3d56e56858f27c (diff) | |
| parent | 1d7b46062feb1d93dd3efaf6ba4d5d934068342c (diff) | |
| download | gitlab-ce-move-markdown-preview.tar.gz | |
Merge branch 'master' into move-markdown-previewmove-markdown-preview
Diffstat (limited to 'app/models/commit.rb')
| -rw-r--r-- | app/models/commit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 2be07ca7d3c..39d7f5b159d 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -371,7 +371,7 @@ class Commit # # Returns a symbol def uri_type(path) - entry = @raw.tree.path(path) + entry = @raw.rugged_tree_entry(path) if entry[:type] == :blob blob = ::Blob.decorate(Gitlab::Git::Blob.new(name: entry[:name]), @project) blob.image? || blob.video? ? :raw : :blob |