diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-11 06:09:15 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-11 06:09:15 +0000 |
| commit | 7cd0959043b069068738dcf88594b2e6dcf6fe7e (patch) | |
| tree | 81585b68e39a4d9ce6e209e3ee04d73f1b0c89e6 /app/serializers/diff_file_base_entity.rb | |
| parent | b6e23edd65a3fb7295c0097016ca0bdc93f437c5 (diff) | |
| download | gitlab-ce-7cd0959043b069068738dcf88594b2e6dcf6fe7e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers/diff_file_base_entity.rb')
| -rw-r--r-- | app/serializers/diff_file_base_entity.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/serializers/diff_file_base_entity.rb b/app/serializers/diff_file_base_entity.rb index 33eb33d314b..2af14f1eb82 100644 --- a/app/serializers/diff_file_base_entity.rb +++ b/app/serializers/diff_file_base_entity.rb @@ -26,13 +26,9 @@ class DiffFileBaseEntity < Grape::Entity target_project, target_branch = edit_project_branch_options(merge_request) - if Feature.enabled?(:web_ide_default) - ide_edit_path(target_project, target_branch, diff_file.new_path) - else - options = merge_request.persisted? && merge_request.source_branch_exists? && !merge_request.merged? ? { from_merge_request_iid: merge_request.iid } : {} + options = merge_request.persisted? && merge_request.source_branch_exists? && !merge_request.merged? ? { from_merge_request_iid: merge_request.iid } : {} - project_edit_blob_path(target_project, tree_join(target_branch, diff_file.new_path), options) - end + project_edit_blob_path(target_project, tree_join(target_branch, diff_file.new_path), options) end expose :old_path_html do |diff_file| |