From 942267957855af29689f9120ad6b296fb748eecf Mon Sep 17 00:00:00 2001
From: Jacques Erasmus <jerasmus@gitlab.com>
Date: Mon, 8 Oct 2018 12:04:48 +0000
Subject: [PATCH] Resolve "Merge request buttons spacing incorrect"

---
 .../javascripts/notes/components/noteable_discussion.vue     | 2 +-
 .../unreleased/48494-fix-merge-request-buttons-spacing.yml   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/48494-fix-merge-request-buttons-spacing.yml

diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue
index e9218723149..c5fdfa1d47c 100644
--- a/app/assets/javascripts/notes/components/noteable_discussion.vue
+++ b/app/assets/javascripts/notes/components/noteable_discussion.vue
@@ -379,7 +379,7 @@ Please check your network connection and try again.`;
                         role="group">
                         <button
                           type="button"
-                          class="btn btn-default mr-2"
+                          class="btn btn-default"
                           @click="resolveHandler()"
                         >
                           <i
diff --git a/changelogs/unreleased/48494-fix-merge-request-buttons-spacing.yml b/changelogs/unreleased/48494-fix-merge-request-buttons-spacing.yml
new file mode 100644
index 00000000000..41cc024b8ac
--- /dev/null
+++ b/changelogs/unreleased/48494-fix-merge-request-buttons-spacing.yml
@@ -0,0 +1,5 @@
+---
+title: Fix incorrect spacing between buttons when commenting on a MR.
+merge_request: 22135
+author:
+type: fixed