diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-13 00:08:10 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-13 00:08:10 +0300 |
| commit | 092b86f10012ebc01aeb0437303c54135d4282a2 (patch) | |
| tree | 04ee56904d1a41b4f62a347ab7c87514913a37d5 /app | |
| parent | 90859e80ca23b8709d56b60d2066b569053e7e02 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue b/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue index 434d554d148..34aa15856d2 100644 --- a/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue +++ b/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue @@ -72,7 +72,7 @@ export default { lineCode() { return ( this.line.line_code || - (this.line.left && this.line.line.left.line_code) || + (this.line.left && this.line.left.line_code) || (this.line.right && this.line.right.line_code) ); }, diff --git a/app/assets/javascripts/diffs/store/utils.js b/app/assets/javascripts/diffs/store/utils.js index 2326018b999..281a0de1fc2 100644 --- a/app/assets/javascripts/diffs/store/utils.js +++ b/app/assets/javascripts/diffs/store/utils.js @@ -498,7 +498,7 @@ export const allDiscussionWrappersExpanded = diff => { } }); } else if (diff.highlighted_diff_lines) { - diff.parallel_diff_lines.forEach(line => { + diff.highlighted_diff_lines.forEach(line => { if (line.discussions.length) { discussionsExpandedArray.push(line.discussionsExpanded); } diff --git a/app/assets/javascripts/pipelines/components/graph/job_item.vue b/app/assets/javascripts/pipelines/components/graph/job_item.vue index 1651d8cb1f8..bfd314e0439 100644 --- a/app/assets/javascripts/pipelines/components/graph/job_item.vue +++ b/app/assets/javascripts/pipelines/components/graph/job_item.vue @@ -111,7 +111,7 @@ export default { :href="status.details_path" :title="tooltipText" :class="cssClassJobName" - class="js-pipeline-graph-job-link qa-job-link" + class="js-pipeline-graph-job-link qa-job-link menu-item" > <job-name-component :name="job.name" :status="job.status" /> </gl-link> |