diff options
Diffstat (limited to 'polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.html')
| -rw-r--r-- | polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.html | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.html b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.html index 6b6e90bf1e..278875e7e4 100644 --- a/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.html +++ b/polygerrit-ui/app/elements/change/gr-change-actions/gr-change-actions.html @@ -32,6 +32,7 @@ limitations under the License. <link rel="import" href="../../shared/gr-rest-api-interface/gr-rest-api-interface.html"> <link rel="import" href="../gr-confirm-abandon-dialog/gr-confirm-abandon-dialog.html"> <link rel="import" href="../gr-confirm-cherrypick-dialog/gr-confirm-cherrypick-dialog.html"> +<link rel="import" href="../gr-confirm-cherrypick-conflict-dialog/gr-confirm-cherrypick-conflict-dialog.html"> <link rel="import" href="../gr-confirm-move-dialog/gr-confirm-move-dialog.html"> <link rel="import" href="../gr-confirm-rebase-dialog/gr-confirm-rebase-dialog.html"> <link rel="import" href="../gr-confirm-revert-dialog/gr-confirm-revert-dialog.html"> @@ -187,6 +188,15 @@ limitations under the License. on-cancel="_handleConfirmDialogCancel" project="[[change.project]]" hidden></gr-confirm-cherrypick-dialog> + <gr-confirm-cherrypick-conflict-dialog id="confirmCherrypickConflict" + class="confirmDialog" + change-status="[[changeStatus]]" + commit-message="[[commitMessage]]" + commit-num="[[commitNum]]" + on-confirm="_handleCherrypickConflictConfirm" + on-cancel="_handleConfirmDialogCancel" + project="[[change.project]]" + hidden></gr-confirm-cherrypick-conflict-dialog> <gr-confirm-move-dialog id="confirmMove" class="confirmDialog" on-confirm="_handleMoveConfirm" |