Commit d4fd6eb5 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'nfriend-remove-release-search-filter-flag' into 'master'

Remove the `:release_search_filter` feature flag

Closes #36528

See merge request gitlab-org/gitlab!21767
parents c3cd5965 44a92180
import FilteredSearchTokenKeys from './filtered_search_token_keys'; import FilteredSearchTokenKeys from './filtered_search_token_keys';
import { __ } from '~/locale'; import { __ } from '~/locale';
export const tokenKeys = []; export const tokenKeys = [
tokenKeys.push(
{ {
key: 'author', key: 'author',
type: 'string', type: 'string',
...@@ -28,27 +26,23 @@ tokenKeys.push( ...@@ -28,27 +26,23 @@ tokenKeys.push(
icon: 'clock', icon: 'clock',
tag: '%milestone', tag: '%milestone',
}, },
); {
if (gon && gon.features && gon.features.releaseSearchFilter) {
tokenKeys.push({
key: 'release', key: 'release',
type: 'string', type: 'string',
param: 'tag', param: 'tag',
symbol: '', symbol: '',
icon: 'rocket', icon: 'rocket',
tag: __('tag name'), tag: __('tag name'),
}); },
} {
key: 'label',
tokenKeys.push({ type: 'array',
key: 'label', param: 'name[]',
type: 'array', symbol: '~',
param: 'name[]', icon: 'labels',
symbol: '~', tag: '~label',
icon: 'labels', },
tag: '~label', ];
});
if (gon.current_user_id) { if (gon.current_user_id) {
// Appending tokenkeys only logged-in // Appending tokenkeys only logged-in
......
...@@ -44,7 +44,6 @@ class Projects::IssuesController < Projects::ApplicationController ...@@ -44,7 +44,6 @@ class Projects::IssuesController < Projects::ApplicationController
before_action do before_action do
push_frontend_feature_flag(:vue_issuable_sidebar, project.group) push_frontend_feature_flag(:vue_issuable_sidebar, project.group)
push_frontend_feature_flag(:release_search_filter, project, default_enabled: true)
end end
respond_to :html respond_to :html
......
...@@ -25,7 +25,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo ...@@ -25,7 +25,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
before_action do before_action do
push_frontend_feature_flag(:vue_issuable_sidebar, @project.group) push_frontend_feature_flag(:vue_issuable_sidebar, @project.group)
push_frontend_feature_flag(:release_search_filter, @project, default_enabled: true)
push_frontend_feature_flag(:async_mr_widget, @project) push_frontend_feature_flag(:async_mr_widget, @project)
end end
......
...@@ -58,7 +58,7 @@ describe('Issues Filtered Search Token Keys (EE)', () => { ...@@ -58,7 +58,7 @@ describe('Issues Filtered Search Token Keys (EE)', () => {
describe('searchBySymbol', () => { describe('searchBySymbol', () => {
it('should return weight tokenKey when found by weight symbol', () => { it('should return weight tokenKey when found by weight symbol', () => {
const tokenKeys = IssuableFilteredSearchTokenKeys.get(); const tokenKeys = IssuableFilteredSearchTokenKeys.get();
const match = tokenKeys.find(tk => tk.key === weightTokenKey.key); const match = tokenKeys.find(tk => tk.symbol === weightTokenKey.symbol);
const result = IssuableFilteredSearchTokenKeys.searchBySymbol(weightTokenKey.symbol); const result = IssuableFilteredSearchTokenKeys.searchBySymbol(weightTokenKey.symbol);
expect(result).toEqual(match); expect(result).toEqual(match);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment