Merge branch 'jivanvl-remove-gldropdown-tags-ff' into 'master'

Remove gldropdown_tags feature flag [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!60153

app/controllers/projects/tags_controller.rb

@@ -9,9 +9,6 @@ class Projects::TagsController < Projects::ApplicationController
   before_action :require_non_empty_project
   before_action :authorize_download_code!
   before_action :authorize_admin_tag!, only: [:new, :create, :destroy]
-  before_action do
-    push_frontend_feature_flag(:gldropdown_tags, default_enabled: :yaml)
-  end
 
   feature_category :source_code_management, [:index, :show, :new, :destroy]
   feature_category :release_evidence, [:create]

app/views/projects/tags/index.html.haml

@@ -9,23 +9,7 @@
       = s_('TagsPage|Tags give the ability to mark specific points in history as being important')
 
     .nav-controls
-      - unless Gitlab::Ci::Features.gldropdown_tags_enabled?
-        = form_tag(filter_tags_path, method: :get) do
-          = search_field_tag :search, params[:search], { placeholder: s_('TagsPage|Filter by tag name'), id: 'tag-search', class: 'form-control search-text-input input-short', spellcheck: false }
-
-        .dropdown
-          %button.dropdown-menu-toggle{ type: 'button', data: { toggle: 'dropdown'} }
-            %span.light
-              = tags_sort_options_hash[@sort]
-            = sprite_icon('chevron-down', css_class: 'dropdown-menu-toggle-icon gl-top-3')
-          %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable
-            %li.dropdown-header
-              = s_('TagsPage|Sort by')
-            - tags_sort_options_hash.each do |value, title|
-              %li
-                = link_to title, filter_tags_path(sort: value), class: ("is-active" if @sort == value)
-      - else
-        #js-tags-sort-dropdown{ data: { filter_tags_path: filter_tags_path, sort_options: tags_sort_options_hash.to_json } }
+      #js-tags-sort-dropdown{ data: { filter_tags_path: filter_tags_path, sort_options: tags_sort_options_hash.to_json } }
       - if can?(current_user, :admin_tag, @project)
         = link_to new_project_tag_path(@project), class: 'btn gl-button btn-confirm', data: { qa_selector: "new_tag_button" } do
           = s_('TagsPage|New tag')

changelogs/unreleased/jivanvl-remove-gldropdown-tags-ff.yml

+---
+title: Remove gldropdown_tags feature flag
+merge_request: 60153
+author:
+type: other

config/feature_flags/development/gldropdown_tags.yml

----
-name: gldropdown_tags
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58589
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327055
-milestone: '13.11'
-type: development
-group: group::continuous integration
-default_enabled: true

lib/gitlab/ci/features.rb

@@ -59,10 +59,6 @@ module Gitlab
       def self.multiple_cache_per_job?
         ::Feature.enabled?(:multiple_cache_per_job, default_enabled: :yaml)
       end
-
-      def self.gldropdown_tags_enabled?
-        ::Feature.enabled?(:gldropdown_tags, default_enabled: :yaml)
-      end
     end
   end
 end

locale/gitlab.pot

@@ -31226,9 +31226,6 @@ msgstr ""
 msgid "TagsPage|Repository has no tags yet."
 msgstr ""
 
-msgid "TagsPage|Sort by"
-msgstr ""
-
 msgid "TagsPage|Tags"
 msgstr ""
 

spec/views/projects/tags/index.html.haml_spec.rb

@@ -20,12 +20,6 @@ RSpec.describe 'projects/tags/index.html.haml' do
     allow(view).to receive(:current_user).and_return(project.namespace.owner)
   end
 
-  it 'defaults sort dropdown toggle to last updated' do
-    stub_feature_flags(gldropdown_tags: false)
-    render
-    expect(rendered).to have_button('Last updated')
-  end
-
   it 'renders links to the Releases page for tags associated with a release' do
     render
     expect(rendered).to have_link(release.name, href: project_releases_path(project, anchor: release.tag))