Use Web IDE path for merge request edit buttons

parent d6696f81
...@@ -37,7 +37,7 @@ module BlobHelper ...@@ -37,7 +37,7 @@ module BlobHelper
end end
def ide_edit_button(project = @project, ref = @ref, path = @path, options = {}) def ide_edit_button(project = @project, ref = @ref, path = @path, options = {})
return unless Feature.enabled?(:web_ide_default) return if Feature.enabled?(:web_ide_default)
return unless blob = readable_blob(options, path, project, ref) return unless blob = readable_blob(options, path, project, ref)
edit_button_tag(blob, edit_button_tag(blob,
......
...@@ -27,9 +27,13 @@ class DiffFileBaseEntity < Grape::Entity ...@@ -27,9 +27,13 @@ class DiffFileBaseEntity < Grape::Entity
next unless merge_request.source_project next unless merge_request.source_project
project_edit_blob_path(merge_request.source_project, if Feature.enabled?(:web_ide_default)
tree_join(merge_request.source_branch, diff_file.new_path), ide_edit_path(merge_request.source_project, merge_request.source_branch, diff_file.new_path)
options) else
project_edit_blob_path(merge_request.source_project,
tree_join(merge_request.source_branch, diff_file.new_path),
options)
end
end end
expose :old_path_html do |diff_file| expose :old_path_html do |diff_file|
......
...@@ -18,6 +18,8 @@ describe 'a maintainer edits files on a source-branch of an MR from a fork', :js ...@@ -18,6 +18,8 @@ describe 'a maintainer edits files on a source-branch of an MR from a fork', :js
end end
before do before do
stub_feature_flags(web_ide_default: false)
target_project.add_maintainer(user) target_project.add_maintainer(user)
sign_in(user) sign_in(user)
......
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