diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2012-09-17 14:24:31 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2012-09-26 16:32:22 -0400 |
| commit | 398ba6f1bb60f176444dedc7b26188e08b920f54 (patch) | |
| tree | a89c8290d9e3d2ced12563f8c9a97fb34fdc1347 /app/controllers/blob_controller.rb | |
| parent | 576cec6c67dcc4ee00b8220ca1a45385583e25b2 (diff) | |
| download | gitlab-ce-398ba6f1bb60f176444dedc7b26188e08b920f54.tar.gz | |
DRY up Blame, Blob and Tree controllers
Diffstat (limited to 'app/controllers/blob_controller.rb')
| -rw-r--r-- | app/controllers/blob_controller.rb | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/app/controllers/blob_controller.rb b/app/controllers/blob_controller.rb index bb051281013..58e70bc9d04 100644 --- a/app/controllers/blob_controller.rb +++ b/app/controllers/blob_controller.rb @@ -16,7 +16,7 @@ class BlobController < ApplicationController before_filter :authorize_code_access! before_filter :require_non_empty_project - before_filter :define_tree_vars + before_filter :assign_ref_vars def show if @tree.is_blob? @@ -37,26 +37,4 @@ class BlobController < ApplicationController not_found! end end - - private - - def define_tree_vars - @ref, @path = extract_ref(params[:id]) - - @id = File.join(@ref, @path) - @repo = @project.repo - @commit = CommitDecorator.decorate(@project.commit(@ref)) - - @tree = Tree.new(@commit.tree, @project, @ref, @path) - @tree = TreeDecorator.new(@tree) - - raise InvalidPathError if @tree.invalid? - - @hex_path = Digest::SHA1.hexdigest(@path) - - @history_path = project_tree_path(@project, @id) - @logs_path = logs_file_project_ref_path(@project, @ref, @path) - rescue NoMethodError, InvalidPathError - not_found! - end end |