diff options
| author | James Lopez <james@jameslopez.es> | 2016-11-29 10:40:56 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-11-29 10:40:56 +0100 |
| commit | 280afe0a6480185f61c4f107724367bd5a170b2a (patch) | |
| tree | 3f126b0397502f34a24523a771c27f716126c6af /app/controllers/projects/blob_controller.rb | |
| parent | 25e1bbd1a80f3139504ad86f6728cde8a564d5da (diff) | |
| download | gitlab-ce-fix/blob-controller-spec.tar.gz | |
fix blob controller spec failure - updated not to use file-path-fix/blob-controller-spec
Diffstat (limited to 'app/controllers/projects/blob_controller.rb')
| -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 398122b3073..9940263ae24 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -119,7 +119,7 @@ class Projects::BlobController < Projects::ApplicationController from_merge_request = MergeRequestsFinder.new(current_user, project_id: @project.id).execute.find_by(iid: params[:from_merge_request_iid]) if from_merge_request && @target_branch == @ref diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + - "#file-path-#{hexdigest(@path)}" + "##{hexdigest(@path)}" else namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end |