diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-10-15 17:40:08 +0300 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-10-15 17:40:08 +0300 |
commit | 5caee568ced04d8e9e0a1c83c76b57db2eb8d2db (patch) | |
tree | 6b2bc16876c4d46551c0597f637f199bc15fa1f3 /app | |
parent | 076398d898e6f4cd7d3c3992de2444404f3a11d0 (diff) | |
parent | 9d885b343fb674b0909455e1bfbd9dbff1b1e143 (diff) |
Merge branch '52669-fixes-quick-actions-preview' into 'master'
Fixes close/reopen quick actions preview for issues and merge_requests
Closes #52669
See merge request gitlab-org/gitlab-ce!22343
Diffstat (limited to 'app')
-rw-r--r-- | app/serializers/issue_entity.rb | 2 | ||||
-rw-r--r-- | app/serializers/merge_request_widget_entity.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/serializers/issue_entity.rb b/app/serializers/issue_entity.rb index 16a477c92fa..c3f7d4651fb 100644 --- a/app/serializers/issue_entity.rb +++ b/app/serializers/issue_entity.rb @@ -42,6 +42,6 @@ class IssueEntity < IssuableEntity end expose :preview_note_path do |issue| - preview_markdown_path(issue.project, quick_actions_target_type: 'Issue', quick_actions_target_id: issue.id) + preview_markdown_path(issue.project, quick_actions_target_type: 'Issue', quick_actions_target_id: issue.iid) end end diff --git a/app/serializers/merge_request_widget_entity.rb b/app/serializers/merge_request_widget_entity.rb index 380e8804f51..9ec24f799ef 100644 --- a/app/serializers/merge_request_widget_entity.rb +++ b/app/serializers/merge_request_widget_entity.rb @@ -222,7 +222,7 @@ class MergeRequestWidgetEntity < IssuableEntity end expose :preview_note_path do |merge_request| - preview_markdown_path(merge_request.project, quick_actions_target_type: 'MergeRequest', quick_actions_target_id: merge_request.id) + preview_markdown_path(merge_request.project, quick_actions_target_type: 'MergeRequest', quick_actions_target_id: merge_request.iid) end expose :merge_commit_path do |merge_request| |