diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-08 14:31:10 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-08 14:31:10 +0300 |
| commit | 3013951c7318d6b08d83c6ec96a4d68d031c3a62 (patch) | |
| tree | c33227b782c76afdbebf2660f84556a9806f7a06 /app/models | |
| parent | 62943cd7961ebe9e3f3343302ec6509c40f5f1fb (diff) | |
| parent | ac2cb65ab3dc2688b3a1db9de661dc01ed196177 (diff) | |
Merge branch 'remove-commit-tree' into 'master'
Remove the Commit#tree method
See merge request gitlab-org/gitlab-ce!16236
Diffstat (limited to 'app/models')
| -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 |