From 96d9d190f5ca7999a2a8e94cfca6f7904cd90dc1 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Mon, 20 Oct 2025 12:25:32 +0100 Subject: [PATCH] Added merged before and after filter to merge request list https://gitlab.com/gitlab-org/gitlab/-/issues/575920 --- .../javascripts/issues/list/constants.js | 22 ++++++++++ .../components/merge_requests_list_app.vue | 18 ++++++++ .../group/get_merge_requests.query.graphql | 4 ++ ...get_merge_requests_approvals.query.graphql | 4 ++ .../get_merge_requests_counts.query.graphql | 10 +++++ .../project/get_merge_requests.query.graphql | 4 ++ ...get_merge_requests_approvals.query.graphql | 4 ++ .../get_merge_requests_counts.query.graphql | 10 +++++ .../filtered_search_bar/constants.js | 4 ++ .../group/get_merge_requests.query.graphql | 4 ++ ...get_merge_requests_approvals.query.graphql | 4 ++ .../get_merge_requests_counts.query.graphql | 10 +++++ .../project/get_merge_requests.query.graphql | 4 ++ ...get_merge_requests_approvals.query.graphql | 4 ++ .../get_merge_requests_counts.query.graphql | 10 +++++ locale/gitlab.pot | 6 +++ .../merge_requests_list_app_spec.js | 41 +++++++++++++++++++ 17 files changed, 163 insertions(+) diff --git a/app/assets/javascripts/issues/list/constants.js b/app/assets/javascripts/issues/list/constants.js index 176aa4db2149c5..555c4ca539aad9 100644 --- a/app/assets/javascripts/issues/list/constants.js +++ b/app/assets/javascripts/issues/list/constants.js @@ -45,6 +45,8 @@ import { TOKEN_TYPE_SUBSCRIBED, TOKEN_TYPE_STATUS, TOKEN_TYPE_PARENT, + TOKEN_TYPE_MERGED_BEFORE, + TOKEN_TYPE_MERGED_AFTER, } from '~/vue_shared/components/filtered_search_bar/constants'; export const ISSUE_REFERENCE = /^#\d+$/; @@ -599,6 +601,26 @@ export const filtersMap = { }, }, }, + [TOKEN_TYPE_MERGED_BEFORE]: { + [API_PARAM]: { + [NORMAL_FILTER]: 'mergedBefore', + }, + [URL_PARAM]: { + [OPERATOR_IS]: { + [NORMAL_FILTER]: 'merged_before', + }, + }, + }, + [TOKEN_TYPE_MERGED_AFTER]: { + [API_PARAM]: { + [NORMAL_FILTER]: 'mergedAfter', + }, + [URL_PARAM]: { + [OPERATOR_IS]: { + [NORMAL_FILTER]: 'merged_after', + }, + }, + }, [TOKEN_TYPE_STATE]: { [API_PARAM]: { [NORMAL_FILTER]: 'state', diff --git a/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue b/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue index 87ff15673c8985..8ea636033b9b72 100644 --- a/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue +++ b/app/assets/javascripts/merge_requests/list/components/merge_requests_list_app.vue @@ -54,6 +54,10 @@ import { TOKEN_TITLE_SUBSCRIBED, TOKEN_TYPE_SEARCH_WITHIN, TOKEN_TITLE_SEARCH_WITHIN, + TOKEN_TITLE_MERGED_BEFORE, + TOKEN_TYPE_MERGED_BEFORE, + TOKEN_TITLE_MERGED_AFTER, + TOKEN_TYPE_MERGED_AFTER, } from '~/vue_shared/components/filtered_search_bar/constants'; import { convertToApiParams, @@ -437,6 +441,20 @@ export default { unique: true, environmentsEndpoint: this.environmentNamesPath, }, + this.state === STATUS_MERGED && { + type: TOKEN_TYPE_MERGED_BEFORE, + title: TOKEN_TITLE_MERGED_BEFORE, + icon: 'clock', + token: DateToken, + operators: OPERATORS_IS, + }, + this.state === STATUS_MERGED && { + type: TOKEN_TYPE_MERGED_AFTER, + title: TOKEN_TITLE_MERGED_AFTER, + icon: 'clock', + token: DateToken, + operators: OPERATORS_IS, + }, { type: TOKEN_TYPE_DEPLOYED_BEFORE, title: TOKEN_TITLE_DEPLOYED_BEFORE, diff --git a/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests.query.graphql b/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests.query.graphql index aa550f82b482f0..bf5a35d147059b 100644 --- a/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests.query.graphql +++ b/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests.query.graphql @@ -28,6 +28,8 @@ query getGroupMergeRequests( $deployedAfter: Time $environmentName: String $subscribed: SubscriptionStatus + $mergedBefore: Time + $mergedAfter: Time $not: MergeRequestsResolverNegatedParams $beforeCursor: String $afterCursor: String @@ -60,6 +62,8 @@ query getGroupMergeRequests( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not includeSubgroups: true before: $beforeCursor diff --git a/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_approvals.query.graphql b/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_approvals.query.graphql index 6c6c96172961aa..a64f00049f0999 100644 --- a/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_approvals.query.graphql +++ b/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_approvals.query.graphql @@ -23,6 +23,8 @@ query getGroupMergeRequestsApprovals( $deployedBefore: Time $deployedAfter: Time $environmentName: String + $mergedBefore: Time + $mergedAfter: Time $not: MergeRequestsResolverNegatedParams $beforeCursor: String $afterCursor: String @@ -53,6 +55,8 @@ query getGroupMergeRequestsApprovals( deployedBefore: $deployedBefore deployedAfter: $deployedAfter environmentName: $environmentName + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not includeSubgroups: true before: $beforeCursor diff --git a/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_counts.query.graphql b/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_counts.query.graphql index 4c3baada9e6c74..ea00ad7e40c035 100644 --- a/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_counts.query.graphql +++ b/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_counts.query.graphql @@ -20,6 +20,8 @@ query getGroupMergeRequestsCount( $deployedAfter: Time $environmentName: String $subscribed: SubscriptionStatus + $mergedBefore: Time + $mergedAfter: Time $not: MergeRequestsResolverNegatedParams ) { namespace: group(fullPath: $fullPath) { @@ -46,6 +48,8 @@ query getGroupMergeRequestsCount( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not includeSubgroups: true ) { @@ -73,6 +77,8 @@ query getGroupMergeRequestsCount( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not includeSubgroups: true ) { @@ -100,6 +106,8 @@ query getGroupMergeRequestsCount( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not includeSubgroups: true ) { @@ -127,6 +135,8 @@ query getGroupMergeRequestsCount( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not includeSubgroups: true ) { diff --git a/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests.query.graphql b/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests.query.graphql index a94e12201d24de..1531b5e10cbc03 100644 --- a/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests.query.graphql +++ b/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests.query.graphql @@ -27,6 +27,8 @@ query getProjectMergeRequests( $deployedAfter: Time $environmentName: String $subscribed: SubscriptionStatus + $mergedBefore: Time + $mergedAfter: Time $not: MergeRequestsResolverNegatedParams $beforeCursor: String $afterCursor: String @@ -58,6 +60,8 @@ query getProjectMergeRequests( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not before: $beforeCursor after: $afterCursor diff --git a/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests_approvals.query.graphql b/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests_approvals.query.graphql index 4a6b8bb6cc7b3e..2d403c8b953da6 100644 --- a/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests_approvals.query.graphql +++ b/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests_approvals.query.graphql @@ -23,6 +23,8 @@ query getProjectMergeRequestsApprovals( $deployedBefore: Time $deployedAfter: Time $environmentName: String + $mergedBefore: Time + $mergedAfter: Time $not: MergeRequestsResolverNegatedParams $beforeCursor: String $afterCursor: String @@ -53,6 +55,8 @@ query getProjectMergeRequestsApprovals( deployedBefore: $deployedBefore deployedAfter: $deployedAfter environmentName: $environmentName + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not before: $beforeCursor after: $afterCursor diff --git a/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests_counts.query.graphql b/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests_counts.query.graphql index b84b3040e11823..b071febb3cbd3e 100644 --- a/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests_counts.query.graphql +++ b/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests_counts.query.graphql @@ -21,6 +21,8 @@ query getProjectMergeRequestsCount( $deployedAfter: Time $environmentName: String $subscribed: SubscriptionStatus + $mergedBefore: Time + $mergedAfter: Time $not: MergeRequestsResolverNegatedParams ) { namespace: project(fullPath: $fullPath) { @@ -48,6 +50,8 @@ query getProjectMergeRequestsCount( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not ) { count @@ -75,6 +79,8 @@ query getProjectMergeRequestsCount( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not ) { count @@ -102,6 +108,8 @@ query getProjectMergeRequestsCount( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not ) { count @@ -129,6 +137,8 @@ query getProjectMergeRequestsCount( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not ) { count diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js b/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js index 86547bb261c22f..81b0d466ebc338 100644 --- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js +++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/constants.js @@ -109,6 +109,8 @@ export const TOKEN_TITLE_CREATED = __('Created date'); export const TOKEN_TITLE_CLOSED = __('Closed date'); export const TOKEN_TITLE_DEPLOYED_BEFORE = __('Deployed before'); export const TOKEN_TITLE_DEPLOYED_AFTER = __('Deployed after'); +export const TOKEN_TITLE_MERGED_BEFORE = __('Merged before'); +export const TOKEN_TITLE_MERGED_AFTER = __('Merged after'); export const TOKEN_TITLE_ASSIGNED_SEAT = __('Assigned seat'); export const TOKEN_TITLE_ENVIRONMENT = __('Environment'); export const TOKEN_TITLE_STATE = __('State'); @@ -158,6 +160,8 @@ export const TOKEN_TYPE_CLOSED = 'closed'; export const TOKEN_TYPE_CUSTOM_FIELD = 'custom-field'; export const TOKEN_TYPE_DEPLOYED_BEFORE = 'deployed-before'; export const TOKEN_TYPE_DEPLOYED_AFTER = 'deployed-after'; +export const TOKEN_TYPE_MERGED_BEFORE = 'merged-before'; +export const TOKEN_TYPE_MERGED_AFTER = 'merged-after'; export const TOKEN_TYPE_ENVIRONMENT = 'environment'; export const TOKEN_TYPE_STATE = 'state'; export const TOKEN_TYPE_SUBSCRIBED = 'subscribed'; diff --git a/ee/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests.query.graphql b/ee/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests.query.graphql index de9c01e34e3b94..c07f39242278d3 100644 --- a/ee/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests.query.graphql +++ b/ee/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests.query.graphql @@ -28,6 +28,8 @@ query getGroupMergeRequestsEE( $deployedAfter: Time $environmentName: String $subscribed: SubscriptionStatus + $mergedBefore: Time + $mergedAfter: Time $not: MergeRequestsResolverNegatedParams $beforeCursor: String $afterCursor: String @@ -60,6 +62,8 @@ query getGroupMergeRequestsEE( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not includeSubgroups: true before: $beforeCursor diff --git a/ee/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_approvals.query.graphql b/ee/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_approvals.query.graphql index 35aa3406dff8c3..2739b0794d9028 100644 --- a/ee/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_approvals.query.graphql +++ b/ee/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_approvals.query.graphql @@ -24,6 +24,8 @@ query getGroupMergeRequestsApprovalsEE( $deployedBefore: Time $deployedAfter: Time $environmentName: String + $mergedBefore: Time + $mergedAfter: Time $not: MergeRequestsResolverNegatedParams $beforeCursor: String $afterCursor: String @@ -55,6 +57,8 @@ query getGroupMergeRequestsApprovalsEE( deployedBefore: $deployedBefore deployedAfter: $deployedAfter environmentName: $environmentName + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not includeSubgroups: true before: $beforeCursor diff --git a/ee/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_counts.query.graphql b/ee/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_counts.query.graphql index 283018dde85c94..06d62b02c57a6b 100644 --- a/ee/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_counts.query.graphql +++ b/ee/app/assets/javascripts/merge_requests/list/queries/group/get_merge_requests_counts.query.graphql @@ -22,6 +22,8 @@ query getGroupMergeRequestsCountEE( $deployedAfter: Time $environmentName: String $subscribed: SubscriptionStatus + $mergedBefore: Time + $mergedAfter: Time $not: MergeRequestsResolverNegatedParams ) { namespace: group(fullPath: $fullPath) { @@ -50,6 +52,8 @@ query getGroupMergeRequestsCountEE( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not includeSubgroups: true ) { @@ -79,6 +83,8 @@ query getGroupMergeRequestsCountEE( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not includeSubgroups: true ) { @@ -108,6 +114,8 @@ query getGroupMergeRequestsCountEE( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not includeSubgroups: true ) { @@ -137,6 +145,8 @@ query getGroupMergeRequestsCountEE( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not includeSubgroups: true ) { diff --git a/ee/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests.query.graphql b/ee/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests.query.graphql index a495e39fb03232..d3e959ec994dec 100644 --- a/ee/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests.query.graphql +++ b/ee/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests.query.graphql @@ -29,6 +29,8 @@ query getProjectMergeRequestsEE( $deployedAfter: Time $environmentName: String $subscribed: SubscriptionStatus + $mergedBefore: Time + $mergedAfter: Time $not: MergeRequestsResolverNegatedParams $beforeCursor: String $afterCursor: String @@ -62,6 +64,8 @@ query getProjectMergeRequestsEE( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not before: $beforeCursor after: $afterCursor diff --git a/ee/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests_approvals.query.graphql b/ee/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests_approvals.query.graphql index dd86038b3f7e36..ee0cc4745f58f2 100644 --- a/ee/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests_approvals.query.graphql +++ b/ee/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests_approvals.query.graphql @@ -24,6 +24,8 @@ query getProjectMergeRequestsApprovalsEE( $deployedBefore: Time $deployedAfter: Time $environmentName: String + $mergedBefore: Time + $mergedAfter: Time $not: MergeRequestsResolverNegatedParams $beforeCursor: String $afterCursor: String @@ -55,6 +57,8 @@ query getProjectMergeRequestsApprovalsEE( deployedBefore: $deployedBefore deployedAfter: $deployedAfter environmentName: $environmentName + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not before: $beforeCursor after: $afterCursor diff --git a/ee/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests_counts.query.graphql b/ee/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests_counts.query.graphql index 8f9b5e1adae4a8..75555643e27017 100644 --- a/ee/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests_counts.query.graphql +++ b/ee/app/assets/javascripts/merge_requests/list/queries/project/get_merge_requests_counts.query.graphql @@ -21,6 +21,8 @@ query getProjectMergeRequestsCountEE( $deployedAfter: Time $environmentName: String $subscribed: SubscriptionStatus + $mergedBefore: Time + $mergedAfter: Time $not: MergeRequestsResolverNegatedParams ) { namespace: project(fullPath: $fullPath) { @@ -48,6 +50,8 @@ query getProjectMergeRequestsCountEE( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not ) { count @@ -75,6 +79,8 @@ query getProjectMergeRequestsCountEE( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not ) { count @@ -102,6 +108,8 @@ query getProjectMergeRequestsCountEE( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not ) { count @@ -129,6 +137,8 @@ query getProjectMergeRequestsCountEE( deployedAfter: $deployedAfter environmentName: $environmentName subscribed: $subscribed + mergedBefore: $mergedBefore + mergedAfter: $mergedAfter not: $not ) { count diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 9e1c45b90b2b6f..754397cef11e35 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -41317,6 +41317,12 @@ msgstr "" msgid "Merged %{timeAgo} by" msgstr "" +msgid "Merged after" +msgstr "" + +msgid "Merged before" +msgstr "" + msgid "Merged branches are being deleted. This can take some time depending on the number of branches. Please refresh the page to see changes." msgstr "" diff --git a/spec/frontend/merge_requests/list/components/merge_requests_list_app_spec.js b/spec/frontend/merge_requests/list/components/merge_requests_list_app_spec.js index 0b51a424c94b6d..463a497c8dd297 100644 --- a/spec/frontend/merge_requests/list/components/merge_requests_list_app_spec.js +++ b/spec/frontend/merge_requests/list/components/merge_requests_list_app_spec.js @@ -35,6 +35,8 @@ import { TOKEN_TYPE_DEPLOYED_BEFORE, TOKEN_TYPE_SUBSCRIBED, TOKEN_TYPE_SEARCH_WITHIN, + TOKEN_TYPE_MERGED_BEFORE, + TOKEN_TYPE_MERGED_AFTER, OPERATOR_IS, OPERATOR_NOT, } from '~/vue_shared/components/filtered_search_bar/constants'; @@ -433,6 +435,45 @@ describe('Merge requests list app', () => { }); }); + describe('when on merged tab', () => { + beforeEach(async () => { + setWindowLocation(`?state=merged`); + + createComponent(); + + await waitForPromises(); + }); + + afterEach(() => { + setWindowLocation('?'); + }); + + it('renders merged before & after when on merged tab', () => { + expect(findIssuableList().props('searchTokens')).toMatchObject([ + { type: TOKEN_TYPE_AUTHOR }, + { type: TOKEN_TYPE_ASSIGNEE }, + { type: TOKEN_TYPE_REVIEWER }, + { type: TOKEN_TYPE_MERGE_USER }, + { type: TOKEN_TYPE_APPROVER }, + { type: TOKEN_TYPE_APPROVED_BY }, + { type: TOKEN_TYPE_MILESTONE }, + { type: TOKEN_TYPE_LABEL }, + { type: TOKEN_TYPE_RELEASE }, + { type: TOKEN_TYPE_MY_REACTION }, + { type: TOKEN_TYPE_DRAFT }, + { type: TOKEN_TYPE_TARGET_BRANCH }, + { type: TOKEN_TYPE_SOURCE_BRANCH }, + { type: TOKEN_TYPE_ENVIRONMENT }, + { type: TOKEN_TYPE_MERGED_BEFORE }, + { type: TOKEN_TYPE_MERGED_AFTER }, + { type: TOKEN_TYPE_DEPLOYED_BEFORE }, + { type: TOKEN_TYPE_DEPLOYED_AFTER }, + { type: TOKEN_TYPE_SUBSCRIBED }, + { type: TOKEN_TYPE_SEARCH_WITHIN }, + ]); + }); + }); + describe('events', () => { describe('when "filter" event is emitted by IssuableList', () => { it('updates IssuableList with url params', async () => { -- GitLab