diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-20 01:12:52 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-20 01:12:52 +0000 |
| commit | 3a97a5ddfd4618fa675a416a00e0c807edb974ca (patch) | |
| tree | aa5ca733af7138936d9924ffcfcb2f2bc96afb76 /app/controllers | |
| parent | f81b55bd350761709b27b4668223305563be4afe (diff) | |
| parent | 8c454b362425228ab14bb4ed5320f6ba2f505679 (diff) | |
| download | gitlab-ce-3a97a5ddfd4618fa675a416a00e0c807edb974ca.tar.gz | |
Merge branch 'rs-blob' into 'master'
Add a `Blob` model that wraps `Gitlab::Git::Blob`
This allows us to take advantage of Rails' `to_partial_path` to render
the correct partial based on the Blob type, rather than cluttering the
view with conditionals.
It also allows (and will allow in the future) better encapsulation for
Blob-related logic which makes sense for our Rails app but might not
make as much sense for the core `gitlab_git` library, such as detecting
if the blob is an SVG.
See merge request !2887
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/blob_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 495a432347e..cd8b2911674 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -87,7 +87,7 @@ class Projects::BlobController < Projects::ApplicationController private def blob - @blob ||= @repository.blob_at(@commit.id, @path) + @blob ||= Blob.decorate(@repository.blob_at(@commit.id, @path)) if @blob @blob |