Merge branch 'ss/wrk-in-prog-limit-default-on' into 'master'

Rm FF for wrk in progress limits

See merge request gitlab-org/gitlab!23229

ee/app/controllers/concerns/ee/boards_actions.rb

@@ -11,7 +11,8 @@ module EE
     private
 
     def push_wip_limits
-      push_frontend_feature_flag(:wip_limits, parent) if parent.feature_available?(:wip_limits)
+      # This is pushing a licensed Feature to the frontend.
+      push_frontend_feature_flag(:wip_limits, default_enabled: true) if parent.feature_available?(:wip_limits)
     end
   end
 end

ee/app/controllers/ee/boards/lists_controller.rb

@@ -36,7 +36,7 @@ module EE
       private
 
       def wip_limits_available?
-        board_parent.beta_feature_available?(:wip_limits)
+        board_parent.feature_available?(:wip_limits)
       end
     end
   end

ee/app/models/ee/list.rb

@@ -38,7 +38,7 @@ module EE
 
     def wip_limits_available?
       strong_memoize(:wip_limits_available) do
-        board.resource_parent.beta_feature_available?(:wip_limits)
+        board.resource_parent.feature_available?(:wip_limits)
       end
     end
 

ee/app/services/ee/boards/lists/create_service.rb

@@ -69,7 +69,7 @@ module EE
         end
 
         def wip_limits_available?
-          parent.beta_feature_available?(:wip_limits)
+          parent.feature_available?(:wip_limits)
         end
       end
     end

ee/app/views/shared/boards/components/_board_settings_sidebar.html.haml

-- if current_board_parent.beta_feature_available?(:wip_limits)
+- if current_board_parent.feature_available?(:wip_limits)
   %board-settings-sidebar

ee/app/views/shared/boards/components/_list_settings.html.haml

-- if current_board_parent.beta_feature_available?(:wip_limits)
+- if current_board_parent.feature_available?(:wip_limits)
   %gl-button.no-drag.rounded-right{ type: "button",
     "@click" => "openSidebarSettings",
     "v-if" => "isSettingsShown",

ee/changelogs/unreleased/ss-wrk-in-prog-limit-default-on.yml

+---
+title: Add support for work in progress limits - Max issue count only
+merge_request:
+author:
+type: added

ee/spec/features/boards/boards_spec.rb

@@ -194,13 +194,13 @@ describe 'issue boards', :js do
       login_as(user)
     end
 
-    context 'When FF is turned on' do
+    context 'When license is available' do
       let!(:label) { create(:label, project: project, name: 'Brount') }
       let!(:list) { create(:list, board: board, label: label, position: 1) }
 
       before do
-        stub_feature_flags(wip_limits: true)
-        visit project_boards_path(project)
+        stub_licensed_features(wip_limits: true)
+        visit_board_page
       end
 
       it 'shows the list settings button' do
@@ -277,9 +277,9 @@ describe 'issue boards', :js do
       end
     end
 
-    context 'When FF is turned off' do
+    context 'When license is not available' do
       before do
-        stub_feature_flags(wip_limits: false)
+        stub_licensed_features(wip_limits: false)
         visit project_boards_path(project)
       end