From f63c1d88b21d3fd32b2e5ad882a65f7a09895151 Mon Sep 17 00:00:00 2001 From: Lee Tickett Date: Thu, 2 Feb 2023 21:57:43 +0000 Subject: [PATCH] Remove project_language_search feature flag Changelog: added --- app/finders/projects_finder.rb | 2 +- app/helpers/explore_helper.rb | 2 +- .../shared/projects/_search_form.html.haml | 17 ++++++++--------- .../development/project_language_search.yml | 8 -------- doc/user/project/working_with_projects.md | 3 ++- spec/features/dashboard/root_explore_spec.rb | 12 ------------ spec/finders/projects_finder_spec.rb | 8 -------- 7 files changed, 12 insertions(+), 40 deletions(-) delete mode 100644 config/feature_flags/development/project_language_search.yml diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb index 7226a4c0d82c89..401bc473216a2f 100644 --- a/app/finders/projects_finder.rb +++ b/app/finders/projects_finder.rb @@ -236,7 +236,7 @@ def by_repository_storage(items) end def by_language(items) - if Feature.enabled?(:project_language_search, current_user) && params[:language].present? + if params[:language].present? items.with_programming_language_id(params[:language]) else items diff --git a/app/helpers/explore_helper.rb b/app/helpers/explore_helper.rb index 721126a4f14361..2967501f628ad0 100644 --- a/app/helpers/explore_helper.rb +++ b/app/helpers/explore_helper.rb @@ -15,7 +15,7 @@ def filter_projects_path(options = {}) namespace_id: params[:namespace_id] } - exist_opts[:language] = params[:language] if Feature.enabled?(:project_language_search, current_user) + exist_opts[:language] = params[:language] options = exist_opts.merge(options).delete_if { |key, value| value.blank? } request_path_with_options(options) diff --git a/app/views/shared/projects/_search_form.html.haml b/app/views/shared/projects/_search_form.html.haml index 10b6b9e8f279b8..47e0e16527661c 100644 --- a/app/views/shared/projects/_search_form.html.haml +++ b/app/views/shared/projects/_search_form.html.haml @@ -28,16 +28,15 @@ - if params[:language].present? = hidden_field_tag :language, params[:language] - - if Feature.enabled?(:project_language_search, current_user) - .dropdown{ class: 'gl-m-0!' } - = dropdown_toggle(search_language_placeholder, { toggle: 'dropdown', testid: 'project-language-dropdown' }) - %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable + .dropdown{ class: 'gl-m-0!' } + = dropdown_toggle(search_language_placeholder, { toggle: 'dropdown', testid: 'project-language-dropdown' }) + %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable + %li + = link_to _('Any'), filter_projects_path(language: nil, name: nil) + - programming_languages.each do |language| %li - = link_to _('Any'), filter_projects_path(language: nil, name: nil) - - programming_languages.each do |language| - %li - = link_to filter_projects_path(language: language.id, name: nil), class: language_state_class(language) do - = language.name + = link_to filter_projects_path(language: language.id, name: nil), class: language_state_class(language) do + = language.name = submit_tag nil, class: 'gl-display-none!' diff --git a/config/feature_flags/development/project_language_search.yml b/config/feature_flags/development/project_language_search.yml deleted file mode 100644 index 2d8c24650d1558..00000000000000 --- a/config/feature_flags/development/project_language_search.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: project_language_search -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104167 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/385465 -milestone: '15.7' -type: development -group: group::workspace -default_enabled: false diff --git a/doc/user/project/working_with_projects.md b/doc/user/project/working_with_projects.md index ce391618a620d4..5f3ceb51e10ead 100644 --- a/doc/user/project/working_with_projects.md +++ b/doc/user/project/working_with_projects.md @@ -159,7 +159,8 @@ You can also choose to hide or show archived projects. ### Filter projects by language -> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/385465) in GitLab 15.9 [with a flag](../../administration/feature_flags.md) named `project_language_search`. Enabled by default. +> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/385465) in GitLab 15.9 [with a flag](../../administration/feature_flags.md) named `project_language_search`. Enabled by default. +> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/110956) in GitLab 15.9. Feature flag `project_language_search` removed. You can filter projects by the programming language they use. To do this: diff --git a/spec/features/dashboard/root_explore_spec.rb b/spec/features/dashboard/root_explore_spec.rb index c0d1f0de1f54ff..a232ebec68e817 100644 --- a/spec/features/dashboard/root_explore_spec.rb +++ b/spec/features/dashboard/root_explore_spec.rb @@ -39,17 +39,5 @@ expect(has_language_dropdown?).to eq(true) end - - context 'with project_language_search ff disabled' do - before do - stub_feature_flags(project_language_search: false) - end - - it 'is conditionally rendered' do - visit explore_projects_path - - expect(has_language_dropdown?).to eq(false) - end - end end end diff --git a/spec/finders/projects_finder_spec.rb b/spec/finders/projects_finder_spec.rb index b181c08b3337e7..297c6f84cef156 100644 --- a/spec/finders/projects_finder_spec.rb +++ b/spec/finders/projects_finder_spec.rb @@ -399,14 +399,6 @@ let(:params) { { language: ruby.id } } it { is_expected.to match_array([internal_project]) } - - context 'when project_language_search feature flag disabled' do - before do - stub_feature_flags(project_language_search: false) - end - - it { is_expected.to match_array([internal_project, public_project]) } - end end describe 'when with_issues_enabled is true' do -- GitLab