diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-10-08 12:04:48 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-10-08 12:04:48 +0000 |
| commit | ecbcda22d31737f343d2e2e79a698cb265340940 (patch) | |
| tree | 8a45bf884c0f049cdccdd4a9e64a5ecea702a30f | |
| parent | afdd1aa75be924f1a9cd58c827524ed802ef982e (diff) | |
| parent | 942267957855af29689f9120ad6b296fb748eecf (diff) | |
| download | gitlab-ce-ecbcda22d31737f343d2e2e79a698cb265340940.tar.gz | |
Merge branch '48494-fix-merge-request-buttons-spacing' into 'master'
Resolve "Merge request buttons spacing incorrect"
Closes #48494
See merge request gitlab-org/gitlab-ce!22135
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_discussion.vue | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/48494-fix-merge-request-buttons-spacing.yml | 5 |
2 files changed, 6 insertions, 1 deletions
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 |