diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-02-28 13:47:10 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-02-28 13:47:10 +0300 |
| commit | 40ec172f75c0c2161c74414c387c802396563ca8 (patch) | |
| tree | d8dc81461120ec5dc88457266c1e72363ac836cc /app/serializers | |
| parent | 56e6dac72781041fe54a6194ca247d6772f3a29c (diff) | |
| parent | 8e5911353bcb48155dc5dffab6a732bbba49cd37 (diff) | |
Merge branch 'web-ide-default-merge-request' into 'master'
Use Web IDE path for merge request edit buttons
See merge request gitlab-org/gitlab-ce!25595
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/diff_file_base_entity.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/serializers/diff_file_base_entity.rb b/app/serializers/diff_file_base_entity.rb index ede9e04b722..d8630165e49 100644 --- a/app/serializers/diff_file_base_entity.rb +++ b/app/serializers/diff_file_base_entity.rb @@ -27,9 +27,13 @@ class DiffFileBaseEntity < Grape::Entity next unless merge_request.source_project - project_edit_blob_path(merge_request.source_project, - tree_join(merge_request.source_branch, diff_file.new_path), - options) + if Feature.enabled?(:web_ide_default) + ide_edit_path(merge_request.source_project, merge_request.source_branch, diff_file.new_path) + else + project_edit_blob_path(merge_request.source_project, + tree_join(merge_request.source_branch, diff_file.new_path), + options) + end end expose :old_path_html do |diff_file| |