From 13e37a3ee5c943525a99481b855d654e97e8597c Mon Sep 17 00:00:00 2001 From: James Lopez Date: Thu, 16 Jun 2016 12:12:27 +0200 Subject: squashed merge and fixed conflicts --- app/models/repository.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/repository.rb') diff --git a/app/models/repository.rb b/app/models/repository.rb index 1ab163510bf..e5b277cb198 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -446,7 +446,7 @@ class Repository def blob_at(sha, path) unless Gitlab::Git.blank_ref?(sha) - Gitlab::Git::Blob.find(self, sha, path) + Blob.decorate(Gitlab::Git::Blob.find(self, sha, path)) end end -- cgit v1.2.1