Merge branch '22303-symbolic-in-tree' into 'master'
#22303 fix mode representation git::tree ( in base 8 ) Closes #22303 See merge request !9780
This commit is contained in:
commit
b2700e64cc
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Fix symlink icon in project tree
|
||||
merge_request: 9780
|
||||
author: mhasbini
|
|
@ -204,7 +204,7 @@ module API
|
|||
expose :id, :name, :type, :path
|
||||
|
||||
expose :mode do |obj, options|
|
||||
filemode = obj.mode.to_s(8)
|
||||
filemode = obj.mode
|
||||
filemode = "0" + filemode if filemode.length < 6
|
||||
filemode
|
||||
end
|
||||
|
|
|
@ -33,7 +33,7 @@ module Gitlab
|
|||
root_id: root_tree.oid,
|
||||
name: entry[:name],
|
||||
type: entry[:type],
|
||||
mode: entry[:filemode],
|
||||
mode: entry[:filemode].to_s(8),
|
||||
path: path ? File.join(path, entry[:name]) : entry[:name],
|
||||
commit_id: sha,
|
||||
)
|
||||
|
|
|
@ -19,6 +19,7 @@ describe Gitlab::Git::Tree, seed_helper: true do
|
|||
it { expect(dir.commit_id).to eq(SeedRepo::Commit::ID) }
|
||||
it { expect(dir.name).to eq('encoding') }
|
||||
it { expect(dir.path).to eq('encoding') }
|
||||
it { expect(dir.mode).to eq('40000') }
|
||||
|
||||
context :subdir do
|
||||
let(:subdir) { Gitlab::Git::Tree.where(repository, SeedRepo::Commit::ID, 'files').first }
|
||||
|
|
Loading…
Reference in New Issue