diff options
author | Brandon Labuschagne <blabuschagne@gitlab.com> | 2019-01-04 14:52:42 +0200 |
---|---|---|
committer | Brandon Labuschagne <blabuschagne@gitlab.com> | 2019-01-04 14:52:42 +0200 |
commit | 3a977cf0c592bc9d7ccc75c3f9f07614b56e6a59 (patch) | |
tree | 43cbb71519cf37165ff1c8855ab1977b87938d86 /app/assets/javascripts/notes/components/note_form.vue | |
parent | 27fe9caed0ded80eb9a8474a9871f5abb77e1276 (diff) | |
parent | 8947e59d9191b9723dc2a49f75dd735b4f3d299c (diff) | |
download | gitlab-ce-3a977cf0c592bc9d7ccc75c3f9f07614b56e6a59.tar.gz |
Fix merge conflict
Diffstat (limited to 'app/assets/javascripts/notes/components/note_form.vue')
-rw-r--r-- | app/assets/javascripts/notes/components/note_form.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/note_form.vue b/app/assets/javascripts/notes/components/note_form.vue index 9b7f3d3588d..e78596f8b52 100644 --- a/app/assets/javascripts/notes/components/note_form.vue +++ b/app/assets/javascripts/notes/components/note_form.vue @@ -226,7 +226,7 @@ export default { <button :disabled="isDisabled" type="button" - class="js-vue-issue-save btn btn-success js-comment-button" + class="js-vue-issue-save btn btn-success js-comment-button qa-reply-comment-button" @click="handleUpdate();" > {{ saveButtonTitle }} |