BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 4deab9a5 by tiagonbotelho
Options

fixes merge request edit bug where it would generate a cloned file and not remove the previous one

parent 161ab6d6
Showing with 0 additions and 6 deletions
Gemfile.lock
...@@ -409,7 +409,6 @@ GEM ...@@ -409,7 +409,6 @@ GEM
mail_room (0.8.0) mail_room (0.8.0)
method_source (0.8.2) method_source (0.8.2)
mime-types (2.99.2) mime-types (2.99.2)
mime-types-data (3.2016.0521)
mimemagic (0.3.1) mimemagic (0.3.1)
mini_portile2 (2.1.0) mini_portile2 (2.1.0)
minitest (5.7.0) minitest (5.7.0)
......
app/controllers/projects/blob_controller.rb
...@@ -48,11 +48,6 @@ class Projects::BlobController < Projects::ApplicationController ...@@ -48,11 +48,6 @@ class Projects::BlobController < Projects::ApplicationController
diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) +
"#file-path-#{hexdigest(@path)}" "#file-path-#{hexdigest(@path)}"
else else
unless params[:file_name].empty?
@previous_path = @path
@path = params[:file_name]
end
namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path))
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment