Merge branch 'psi-iteration-board-lists' into 'master'

Remove iteration_board_lists feature flag

See merge request gitlab-org/gitlab!75404

doc/user/project/issue_board.md

@@ -313,12 +313,8 @@ As in other list types, click the trash icon to remove a list.
 
 ### Iteration lists **(PREMIUM)**
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/250479) in GitLab 13.11 [with a flag](../../administration/feature_flags.md) named `iteration_board_lists`. Enabled by default.
-
-FLAG:
-On self-managed GitLab, by default this feature is available. To hide the feature, ask an
-administrator to [disable the `iteration_board_lists` flag](../../administration/feature_flags.md).
-On GitLab.com, this feature is available.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/250479) in GitLab 13.11 [with a flag](../../administration/feature_flags.md) named `iteration_board_lists`. Enabled by default.
+> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75404) in GitLab 14.6. Feature flag `iteration_board_lists` removed.
 
 You're also able to create lists of an iteration.
 These lists filter issues by the assigned iteration.

ee/app/services/ee/boards/issues/list_service.rb

@@ -65,7 +65,7 @@ module EE
         def all_iteration_lists
           # Note that the names are very similar but these are different.
           # One is a license name and the other is a feature flag
-          if parent.feature_available?(:board_iteration_lists) && ::Feature.enabled?(:iteration_board_lists, parent, default_enabled: :yaml)
+          if parent.feature_available?(:board_iteration_lists)
             board.lists.iteration.where.not(iteration_id: nil)
           else
             ::List.none

ee/app/services/ee/boards/issues/move_service.rb

@@ -54,7 +54,7 @@ module EE
             milestone_id: milestone_id
           }
 
-          movement_args[:sprint_id] = iteration_id(issue) if ::Feature.enabled?(:iteration_board_lists, parent, default_enabled: :yaml)
+          movement_args[:sprint_id] = iteration_id(issue)
 
           movement_args
         end

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

@@ -10,7 +10,6 @@ module EE
 
         override :execute
         def execute(board)
-          return ServiceResponse.error(message: 'iteration_board_lists feature flag is disabled') if type == :iteration && ::Feature.disabled?(:iteration_board_lists, board.resource_parent, default_enabled: :yaml)
           return license_validation_error unless valid_license?(board.resource_parent)
 
           super

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

@@ -18,7 +18,6 @@ module EE
         def unavailable_list_types_for(board)
           list_types = super
           list_types += unlicensed_lists_for(board)
-          list_types << ::List.list_types[:iteration] if ::Feature.disabled?(:iteration_board_lists, board.resource_parent, default_enabled: :yaml)
 
           list_types.uniq
         end

ee/config/feature_flags/development/iteration_board_lists.yml

----
-name: iteration_board_lists
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49688
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/250479
-milestone: '13.7'
-type: development
-group: group::project management
-default_enabled: true

ee/spec/controllers/boards/lists_controller_spec.rb

@@ -64,19 +64,6 @@ RSpec.describe Boards::ListsController do
       context 'for iteration lists' do
         let_it_be(:iteration) { create(:iteration, group: group) }
 
-        context 'when iteration_board_lists is disabled' do
-          before do
-            stub_feature_flags(iteration_board_lists: false)
-          end
-
-          it 'returns an error' do
-            create_board_list user: user, board: board, iteration_id: iteration.id
-
-            expect(response).to have_gitlab_http_status(:unprocessable_entity)
-            expect(json_response['errors']).to eq(['iteration_board_lists feature flag is disabled'])
-          end
-        end
-
         context 'when license is available' do
           before do
             stub_licensed_features(board_iteration_lists: true)

ee/spec/graphql/ee/mutations/boards/lists/create_spec.rb

@@ -114,14 +114,6 @@ RSpec.describe Mutations::Boards::Lists::Create do
           end
         end
 
-        context 'when feature flag is disabled' do
-          it 'returns an error' do
-            stub_feature_flags(iteration_board_lists: false)
-
-            expect(subject[:errors]).to include 'iteration_board_lists feature flag is disabled'
-          end
-        end
-
         it 'creates a new issue board list for the iteration' do
           expect { subject }.to change { board.lists.count }.from(1).to(2)
 

ee/spec/services/ee/boards/issues/list_service_spec.rb

@@ -109,16 +109,6 @@ RSpec.describe Boards::Issues::ListService, services: true do
               expect(issues).to include(iteration_issue)
             end
           end
-
-          context 'when feature flag is disabled' do
-            before do
-              stub_feature_flags(iteration_board_lists: false)
-            end
-
-            it 'includes issues in the iteration list' do
-              expect(issues).to include(iteration_issue)
-            end
-          end
         end
       end
 

ee/spec/services/ee/boards/issues/move_service_spec.rb

@@ -114,17 +114,6 @@ RSpec.describe Boards::Issues::MoveService, services: true do
           .from(nil)
           .to(iteration_list1.iteration)
       end
-
-      context 'when feature flag is disabled' do
-        before do
-          stub_feature_flags(iteration_board_lists: false)
-        end
-
-        it 'does not assign the iteration' do
-          expect { described_class.new(parent, user, params).execute(issue) }
-            .not_to change { issue.reload.iteration }
-        end
-      end
     end
 
     context 'from iteration to backlog list' do

ee/spec/services/ee/boards/lists/create_service_spec.rb

@@ -83,15 +83,6 @@ RSpec.describe Boards::Lists::CreateService do
         end
       end
 
-      it 'returns an error when feature flag is disabled' do
-        stub_feature_flags(iteration_board_lists: false)
-
-        response = service.execute(board)
-
-        expect(response.success?).to eq(false)
-        expect(response.errors).to include('iteration_board_lists feature flag is disabled')
-      end
-
       it 'returns an error when license is unavailable' do
         stub_licensed_features(board_iteration_lists: false)
 

ee/spec/services/ee/boards/lists/list_service_spec.rb

@@ -71,16 +71,6 @@ RSpec.describe Boards::Lists::ListService do
           expect(execute_service)
             .to match_array([backlog_list, list, iteration_list, board.lists.closed.first])
         end
-
-        context 'when the feature flag is disabled' do
-          before do
-            stub_feature_flags(iteration_board_lists: false)
-          end
-
-          it 'filters out iteration lists that might have been created while subscribed' do
-            expect(execute_service).to match_array [backlog_list, list, board.lists.closed.first]
-          end
-        end
       end
 
       context 'when feature is disabled' do

ee/spec/support/shared_examples/requests/api/iteration_board_list_shared_examples.rb

@@ -14,15 +14,6 @@ RSpec.shared_examples 'iteration board list' do
       expect(json_response.dig('message', 'error')).to eq('Iteration not found')
     end
 
-    it 'returns 400 if feature flag is disabled' do
-      stub_feature_flags(iteration_board_lists: false)
-
-      post api(url, user), params: { iteration_id: iteration.id }
-
-      expect(response).to have_gitlab_http_status(:bad_request)
-      expect(json_response.dig('message', 'error')).to eq('iteration_board_lists feature flag is disabled')
-    end
-
     it 'returns 400 if not licensed' do
       stub_licensed_features(board_iteration_lists: false)