Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/diffs/components/parallel_diff_view.vue1
-rw-r--r--spec/support/helpers/merge_request_diff_helpers.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/diffs/components/parallel_diff_view.vue b/app/assets/javascripts/diffs/components/parallel_diff_view.vue
index 3481a6be127..62756a314f1 100644
--- a/app/assets/javascripts/diffs/components/parallel_diff_view.vue
+++ b/app/assets/javascripts/diffs/components/parallel_diff_view.vue
@@ -159,6 +159,7 @@ export default {
)"
:key="line.left.lineCode || line.right.lineCode"
class="notes_holder"
+ :class="hasDiscussion(line) ? '' : 'js-temp-notes-holder'"
>
<td class="notes_line old"></td>
<td class="notes_content parallel old">
diff --git a/spec/support/helpers/merge_request_diff_helpers.rb b/spec/support/helpers/merge_request_diff_helpers.rb
index c98aa503ed1..3b49d0b3319 100644
--- a/spec/support/helpers/merge_request_diff_helpers.rb
+++ b/spec/support/helpers/merge_request_diff_helpers.rb
@@ -2,7 +2,7 @@ module MergeRequestDiffHelpers
def click_diff_line(line_holder, diff_side = nil)
line = get_line_components(line_holder, diff_side)
line[:content].hover
- line[:num].find('.add-diff-note', visible: false).send_keys(:return)
+ line[:num].find('.js-add-diff-note-button', visible: false).send_keys(:return)
end
def get_line_components(line_holder, diff_side = nil)