diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-24 15:14:19 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-24 15:14:19 +0000 |
| commit | b8d516a6876de74b68a800c5b69af9448b0de140 (patch) | |
| tree | 3a56c8af8b36d03c20e9de4298f30b08cba0ea5a /app/assets/javascripts/notes/components/notes_app.vue | |
| parent | 77b8390171a55d4593e3730551751d8348992f80 (diff) | |
| download | gitlab-ce-b8d516a6876de74b68a800c5b69af9448b0de140.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes/components/notes_app.vue')
| -rw-r--r-- | app/assets/javascripts/notes/components/notes_app.vue | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes/components/notes_app.vue b/app/assets/javascripts/notes/components/notes_app.vue index e568fd0c2d7..c4924cd41f5 100644 --- a/app/assets/javascripts/notes/components/notes_app.vue +++ b/app/assets/javascripts/notes/components/notes_app.vue @@ -104,6 +104,10 @@ export default { }); } + if (this.sortDirDesc) { + return skeletonNotes.concat(this.discussions); + } + return this.discussions.concat(skeletonNotes); }, canReply() { |