diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-25 18:09:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-25 18:09:02 +0300 |
| commit | d1c0c1c4c3241eae6795562d8a0c22def6771238 (patch) | |
| tree | 676e20b1bbee71a6a78b95dd517f0ffa7e684f96 /app/assets/javascripts/notes | |
| parent | fc4faf47ac4e5f1ddc40640c42c32405c38c9455 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
| -rw-r--r-- | app/assets/javascripts/notes/stores/actions.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js index dc7f1577bbb..f7f211c65c2 100644 --- a/app/assets/javascripts/notes/stores/actions.js +++ b/app/assets/javascripts/notes/stores/actions.js @@ -95,12 +95,19 @@ export const fetchDiscussions = ( { commit, dispatch, getters }, { path, filter, persistFilter }, ) => { - const config = + let config = filter !== undefined ? { params: { notes_filter: filter, persist_filter: persistFilter } } : null; if ( + window.gon?.features?.mrActivityFilters && + getters.noteableType === constants.MERGE_REQUEST_NOTEABLE_TYPE + ) { + config = { params: { notes_filter: 0, persist_filter: false } }; + } + + if ( getters.noteableType === constants.ISSUE_NOTEABLE_TYPE || getters.noteableType === constants.MERGE_REQUEST_NOTEABLE_TYPE ) { |