diff options
| author | Jacopo <beschi.jacopo@gmail.com> | 2018-10-14 13:30:12 +0200 |
|---|---|---|
| committer | Jacopo <beschi.jacopo@gmail.com> | 2018-10-15 12:55:27 +0200 |
| commit | 9d885b343fb674b0909455e1bfbd9dbff1b1e143 (patch) | |
| tree | a4e3fd7f0fac9ff1723e0ac4e9c802eb0912720d /app/serializers | |
| parent | 4127b357881fedbf903159e089cc0c9d99c37eff (diff) | |
| download | gitlab-ce-9d885b343fb674b0909455e1bfbd9dbff1b1e143.tar.gz | |
Fixes close/reopen quick actions preview for issues and merge_requests
Close/reopen quick actions preview wasn't shown properly, now the
preview is shown as expected.
Diffstat (limited to 'app/serializers')
| -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| |