diff options
| author | James Lopez <james@jameslopez.es> | 2016-06-16 12:12:27 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-06-16 12:12:28 +0200 |
| commit | 13e37a3ee5c943525a99481b855d654e97e8597c (patch) | |
| tree | 21cd6acfe884046eeb32bc23095b6a2f9f02c8cb /app/models/repository.rb | |
| parent | 9be06bbbb40a64b060fe9042fc84817551dfed08 (diff) | |
| download | gitlab-ce-13e37a3ee5c943525a99481b855d654e97e8597c.tar.gz | |
squashed merge and fixed conflicts
Diffstat (limited to 'app/models/repository.rb')
| -rw-r--r-- | app/models/repository.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |