Merge branch '222763-remove-project_iterations-feature-flag' into 'master'

Remove `project_iterations` FF to add iteration reports in projects

See merge request gitlab-org/gitlab!44921

doc/user/group/iterations/index.md

@@ -64,6 +64,15 @@ To edit an iteration, click the three-dot menu (**{ellipsis_v}**) > **Edit itera
 To learn how to add an issue to an iteration, see the steps in
 [Managing issues](../../project/issues/managing_issues.md#add-an-issue-to-an-iteration).
 
+## View an iteration report
+
+> Viewing iteration reports in projects [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/222763) in [GitLab Starter](https://about.gitlab.com/pricing/) 13.5.
+
+You can track the progress of an iteration by reviewing iteration reports.
+An iteration report displays a list of all the issues assigned to an iteration and their status.
+
+To view an iteration report, go to the iterations list page and click an iteration's title.
+
 ## Disable Iterations **(CORE ONLY)**
 
 GitLab Iterations feature is deployed with a feature flag that is **enabled by default**.

ee/app/views/layouts/nav/sidebar/_project_iterations_link.html.haml

-- return unless Feature.enabled?(:project_iterations, @project.group)
 - return unless @project.feature_available?(:iterations)
 - return unless can?(current_user, :read_iteration, @project)
 

ee/app/views/projects/iterations/index.html.haml

-- return unless Feature.enabled?(:project_iterations, @project.group)
 - page_title _("Iterations")
 
 .js-iterations-list{ data: { full_path: @project.full_path } }

ee/app/views/projects/iterations/inherited/show.html.haml

@@ -2,8 +2,7 @@
 - breadcrumb_title params[:id]
 - page_title _("Iteration")
 
-- if Feature.enabled?(:project_iterations, @project.group)
-  .js-iteration{ data: { full_path: @project.full_path,
-    can_edit: can?(current_user, :admin_iteration, @project).to_s,
-    iteration_id: params[:id],
-    preview_markdown_path: preview_markdown_path(@project) } }
+.js-iteration{ data: { full_path: @project.full_path,
+  can_edit: can?(current_user, :admin_iteration, @project).to_s,
+  iteration_id: params[:id],
+  preview_markdown_path: preview_markdown_path(@project) } }

ee/changelogs/unreleased/222763-remove-project_iterations-feature-flag.yml

+---
+title: Add iteration reports in projects
+merge_request: 44921
+author:
+type: added

ee/config/feature_flags/development/project_iterations.yml

----
-name: project_iterations
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37715
-rollout_issue_url:
-group: group::project management
-type: development
-default_enabled: false

ee/spec/features/projects/navbar_spec.rb

@@ -11,8 +11,6 @@ RSpec.describe 'Project navbar' do
   let_it_be(:project) { create(:project, :repository) }
 
   before do
-    stub_feature_flags(project_iterations: false)
-
     insert_package_nav(_('Operations'))
 
     project.add_maintainer(user)
@@ -98,21 +96,4 @@ RSpec.describe 'Project navbar' do
 
     it_behaves_like 'verified navigation bar'
   end
-
-  context 'when iterations is available' do
-    before do
-      stub_licensed_features(iterations: true)
-      stub_feature_flags(project_iterations: true)
-
-      insert_after_sub_nav_item(
-        _('Milestones'),
-        within: _('Issues'),
-        new_sub_nav_item_name: _('Iterations')
-      )
-
-      visit project_path(project)
-    end
-
-    it_behaves_like 'verified navigation bar'
-  end
 end

ee/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb

@@ -219,28 +219,10 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
           stub_licensed_features(iterations: true)
         end
 
-        context 'with project_iterations feature flag enabled' do
-          before do
-            stub_feature_flags(project_iterations: true)
-          end
-
-          it 'is visible' do
-            render
-
-            expect(rendered).to have_text 'Iterations'
-          end
-        end
-
-        context 'with project_iterations feature flag disabled' do
-          before do
-            stub_feature_flags(project_iterations: false)
-          end
-
-          it 'is not visible' do
-            render
+        it 'is visible' do
+          render
 
-            expect(rendered).not_to have_text 'Iterations'
-          end
+          expect(rendered).to have_text 'Iterations'
         end
       end
 
@@ -263,28 +245,10 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
           stub_licensed_features(iterations: true)
         end
 
-        context 'with project_iterations feature flag enabled' do
-          before do
-            stub_feature_flags(project_iterations: true)
-          end
-
-          it 'is not visible' do
-            render
-
-            expect(rendered).not_to have_text 'Iterations'
-          end
-        end
-
-        context 'with project_iterations feature flag disabled' do
-          before do
-            stub_feature_flags(project_iterations: false)
-          end
-
-          it 'is not visible' do
-            render
+        it 'is not visible' do
+          render
 
-            expect(rendered).not_to have_text 'Iterations'
-          end
+          expect(rendered).not_to have_text 'Iterations'
         end
       end
 

spec/support/shared_contexts/navbar_structure_context.rb

@@ -44,7 +44,8 @@ RSpec.shared_context 'project navbar structure' do
           _('Boards'),
           _('Labels'),
           _('Service Desk'),
-          _('Milestones')
+          _('Milestones'),
+          _('Iterations')
         ]
       },
       {