diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-12-11 17:18:52 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-12-11 17:18:52 +0300 |
| commit | 71209c91f0b526fbf28c1dbf6c352b65d0ea0beb (patch) | |
| tree | 79fa15e6eb67104d268889a8cd6c7a2db1cc68db /app/assets/javascripts/notes/components/noteable_discussion.vue | |
| parent | b388111f6ed5181c357f5c37277f16c6ae234f5a (diff) | |
| parent | 63e2c97b36d0c14db36ed97e0822394f50d4dc8c (diff) | |
Merge branch 'gt-remove-unnecessary-line-before-reply-holder' into 'master'
Remove boxes around code comments
Closes #54030 and #54058
See merge request gitlab-org/gitlab-ce!23092
Diffstat (limited to 'app/assets/javascripts/notes/components/noteable_discussion.vue')
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_discussion.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index 441c6073202..5c9a28b8512 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/app/assets/javascripts/notes/components/noteable_discussion.vue @@ -398,7 +398,7 @@ Please check your network connection and try again.`; <div class="discussion-with-resolve-btn"> <button type="button" - class="js-vue-discussion-reply btn btn-text-field mr-sm-2 qa-discussion-reply" + class="js-vue-discussion-reply btn btn-text-field qa-discussion-reply" title="Add a reply" @click="showReplyForm" > @@ -407,7 +407,7 @@ Please check your network connection and try again.`; <div v-if="discussion.resolvable"> <button type="button" - class="btn btn-default mr-sm-2" + class="btn btn-default ml-sm-2" @click="resolveHandler();" > <i v-if="isResolving" aria-hidden="true" class="fa fa-spinner fa-spin"></i> |