Merge branch 'gl-button-resolve-conflict' into 'master'

Apply new GitLab UI for buttons in MR resolve conflicts page

See merge request gitlab-org/gitlab!52783

app/views/projects/merge_requests/conflicts/_submit_form.html.haml

@@ -21,4 +21,4 @@
           %button.btn.gl-button.btn-success.js-submit-button{ type: "button", "@click" => "commit()", ":disabled" => "!readyToCommit" }
             %span {{commitButtonText}}
         .col-6.text-right
-          = link_to "Cancel", project_merge_request_path(@merge_request.project, @merge_request), class: "gl-button btn btn-cancel"
+          = link_to "Cancel", project_merge_request_path(@merge_request.project, @merge_request), class: "gl-button btn btn-default"

app/views/projects/merge_requests/conflicts/components/_diff_file_editor.html.haml

@@ -4,7 +4,7 @@
       .discard-changes-alert
         Are you sure you want to discard your changes?
         .discard-actions
-          %button.btn.btn-sm.btn-close{ "@click" => "acceptDiscardConfirmation(file)" } Discard changes
-          %button.btn.btn-sm{ "@click" => "cancelDiscardConfirmation(file)" } Cancel
+          %button.btn.btn-sm.btn-danger-secondary.gl-button{ "@click" => "acceptDiscardConfirmation(file)" } Discard changes
+          %button.btn.btn-default.btn-sm.gl-button{ "@click" => "cancelDiscardConfirmation(file)" } Cancel
     .editor-wrap{ ":class" => "classObject" }
       .editor{ "style" => "height: 350px", data: { 'editor-loading': true } }

changelogs/unreleased/gl-button-resolve-conflict.yml

+---
+title: Apply new GitLab UI for buttons in MR resolve conflicts page
+merge_request: 52783
+author: Yogi (@yo)
+type: other