diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-05 03:12:26 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-05 03:12:26 +0000 |
| commit | 678db4e3943944ffd1c2b69af56cd5a61375972f (patch) | |
| tree | 2dcc37074f276928e709f65f11a1f70ac83957d7 /app/assets/javascripts/notes/components/notes_app.vue | |
| parent | cdd01f01dcca9b2ec93f3e0538329c0b6cb222ae (diff) | |
| download | gitlab-ce-678db4e3943944ffd1c2b69af56cd5a61375972f.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 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/notes_app.vue b/app/assets/javascripts/notes/components/notes_app.vue index 58570e76795..8394fe65914 100644 --- a/app/assets/javascripts/notes/components/notes_app.vue +++ b/app/assets/javascripts/notes/components/notes_app.vue @@ -258,7 +258,13 @@ export default { getFetchDiscussionsConfig() { const defaultConfig = { path: this.getNotesDataByProp('discussionsPath') }; - if (doesHashExistInUrl(constants.NOTE_UNDERSCORE)) { + const currentFilter = + this.getNotesDataByProp('notesFilter') || constants.DISCUSSION_FILTERS_DEFAULT_VALUE; + + if ( + doesHashExistInUrl(constants.NOTE_UNDERSCORE) && + currentFilter !== constants.DISCUSSION_FILTERS_DEFAULT_VALUE + ) { return { ...defaultConfig, filter: constants.DISCUSSION_FILTERS_DEFAULT_VALUE, |