diff options
| author | Sato Hiroyuki <sathiroyuki@gmail.com> | 2013-03-21 14:41:16 +0000 |
|---|---|---|
| committer | Sato Hiroyuki <sathiroyuki@gmail.com> | 2013-03-21 15:10:14 +0000 |
| commit | a1fe375e44987d89b9f9fbacb784eed83de233b2 (patch) | |
| tree | 569d9db493584db0f19cc176f73f40b52873b7b5 /app/controllers | |
| parent | f7ca6c5079bb3c79c709721dae06b77200a1972e (diff) | |
| download | gitlab-ce-a1fe375e44987d89b9f9fbacb784eed83de233b2.tar.gz | |
Fix 404 error while displaying json files.
It uses params[:id] instead of request.fullpath.
It should fix #3132.
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/blame_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/blob_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/tree_controller.rb | 1 |
3 files changed, 0 insertions, 5 deletions
diff --git a/app/controllers/blame_controller.rb b/app/controllers/blame_controller.rb index 37d7245ccb4..76caa4a69c4 100644 --- a/app/controllers/blame_controller.rb +++ b/app/controllers/blame_controller.rb @@ -7,8 +7,6 @@ class BlameController < ProjectResourceController before_filter :authorize_code_access! before_filter :require_non_empty_project - before_filter :assign_ref_vars - def show @repo = @project.repo @blame = Grit::Blob.blame(@repo, @commit.id, @path) diff --git a/app/controllers/blob_controller.rb b/app/controllers/blob_controller.rb index d4a45d9508e..530b72fee7f 100644 --- a/app/controllers/blob_controller.rb +++ b/app/controllers/blob_controller.rb @@ -7,8 +7,6 @@ class BlobController < ProjectResourceController before_filter :authorize_code_access! before_filter :require_non_empty_project - before_filter :assign_ref_vars - def show if @tree.is_blob? send_data( diff --git a/app/controllers/tree_controller.rb b/app/controllers/tree_controller.rb index 2151bd7cbbd..093fd5e512e 100644 --- a/app/controllers/tree_controller.rb +++ b/app/controllers/tree_controller.rb @@ -7,7 +7,6 @@ class TreeController < ProjectResourceController before_filter :authorize_code_access! before_filter :require_non_empty_project - before_filter :assign_ref_vars before_filter :edit_requirements, only: [:edit, :update] def show |