home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

Browse Source
This commit is contained in:
Dmitriy Zaporozhets
2015-07-01 11:37:22 +02:00
parent 690aafebdb 2d85458ac7
commit 16b8a1ef04
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/repository.rb
+4 -2
View File
@@ -8,7 +8,7 @@ class Repository
@project = project
if path_with_namespace
@raw_repository = Gitlab::Git::Repository.new(path_to_repo)
@raw_repository = Gitlab::Git::Repository.new(path_to_repo)
@raw_repository.autocrlf = :input
end
@@ -173,7 +173,9 @@ class Repository
end
def blob_at(sha, path)
Gitlab::Git::Blob.find(self, sha, path)
unless Gitlab::Git.blank_ref?(sha)
Gitlab::Git::Blob.find(self, sha, path)
end
end
def blob_by_oid(oid)
spec/models/repository_spec.rb
+8
View File
@@ -25,4 +25,12 @@ describe Repository do
it { is_expected.to eq('c1acaa58bbcbc3eafe538cb8274ba387047b69f8') }
end
describe :blob_at do
context 'blank sha' do
subject { repository.blob_at(Gitlab::Git::BLANK_SHA, '.gitignore') }
it { is_expected.to be_nil }
end
end
end