diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-23 21:08:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-23 21:08:31 +0000 |
| commit | e679965983c591a9f009f6356b67a844582ca1bb (patch) | |
| tree | 03648473fe38e9ff4c720d4ec8c58caa048c7181 /app/serializers | |
| parent | 7e1e5ca371cbfe77bdf56fcf65a4e749e6e86a06 (diff) | |
| download | gitlab-ce-e679965983c591a9f009f6356b67a844582ca1bb.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/diff_file_base_entity.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/diff_file_base_entity.rb b/app/serializers/diff_file_base_entity.rb index 596f5d686da..5036f28184c 100644 --- a/app/serializers/diff_file_base_entity.rb +++ b/app/serializers/diff_file_base_entity.rb @@ -48,7 +48,7 @@ class DiffFileBaseEntity < Grape::Entity next unless has_edit_path?(merge_request) - gitlab_ide_merge_request_path(merge_request) + ide_merge_request_path(merge_request, diff_file.new_path) end expose :old_path_html do |diff_file| |