Merge branch 'issue_212330' into 'master'

Remove license checks of export_issues

See merge request gitlab-org/gitlab!28675

doc/ci/variables/README.md

@@ -715,8 +715,8 @@ if [[ -d "/builds/gitlab-examples/ci-debug-trace/.git" ]]; then
 ++ CI_SERVER_VERSION_PATCH=0
 ++ export CI_SERVER_REVISION=f4cc00ae823
 ++ CI_SERVER_REVISION=f4cc00ae823
-++ export GITLAB_FEATURES=audit_events,burndown_charts,code_owners,contribution_analytics,description_diffs,elastic_search,export_issues,group_bulk_edit,group_burndown_charts,group_webhooks,issuable_default_templates,issue_weights,jenkins_integration,ldap_group_sync,member_lock,merge_request_approvers,multiple_issue_assignees,multiple_ldap_servers,multiple_merge_request_assignees,protected_refs_for_users,push_rules,related_issues,repository_mirrors,repository_size_limit,scoped_issue_board,usage_quotas,visual_review_app,wip_limits,adjourned_deletion_for_projects_and_groups,admin_audit_log,auditor_user,batch_comments,blocking_merge_requests,board_assignee_lists,board_milestone_lists,ci_cd_projects,cluster_deployments,code_analytics,code_owner_approval_required,commit_committer_check,cross_project_pipelines,custom_file_templates,custom_file_templates_for_namespace,custom_project_templates,custom_prometheus_metrics,cycle_analytics_for_groups,db_load_balancing,default_project_deletion_protection,dependency_proxy,deploy_board,design_management,email_additional_text,extended_audit_events,external_authorization_service_api_management,feature_flags,file_locks,geo,github_project_service_integration,group_allowed_email_domains,group_project_templates,group_saml,issues_analytics,jira_dev_panel_integration,ldap_group_sync_filter,merge_pipelines,merge_request_performance_metrics,merge_trains,metrics_reports,multiple_approval_rules,multiple_clusters,multiple_group_issue_boards,object_storage,operations_dashboard,packages,productivity_analytics,project_aliases,protected_environments,reject_unsigned_commits,required_ci_templates,scoped_labels,service_desk,smartcard_auth,group_timelogs,type_of_work_analytics,unprotection_restrictions,ci_project_subscriptions,cluster_health,container_scanning,dast,dependency_scanning,epics,group_ip_restriction,incident_management,insights,license_management,personal_access_token_expiration_policy,pod_logs,prometheus_alerts,pseudonymizer,report_approver_rules,sast,security_dashboard,tracing,web_ide_terminal
-++ GITLAB_FEATURES=audit_events,burndown_charts,code_owners,contribution_analytics,description_diffs,elastic_search,export_issues,group_bulk_edit,group_burndown_charts,group_webhooks,issuable_default_templates,issue_weights,jenkins_integration,ldap_group_sync,member_lock,merge_request_approvers,multiple_issue_assignees,multiple_ldap_servers,multiple_merge_request_assignees,protected_refs_for_users,push_rules,related_issues,repository_mirrors,repository_size_limit,scoped_issue_board,usage_quotas,visual_review_app,wip_limits,adjourned_deletion_for_projects_and_groups,admin_audit_log,auditor_user,batch_comments,blocking_merge_requests,board_assignee_lists,board_milestone_lists,ci_cd_projects,cluster_deployments,code_analytics,code_owner_approval_required,commit_committer_check,cross_project_pipelines,custom_file_templates,custom_file_templates_for_namespace,custom_project_templates,custom_prometheus_metrics,cycle_analytics_for_groups,db_load_balancing,default_project_deletion_protection,dependency_proxy,deploy_board,design_management,email_additional_text,extended_audit_events,external_authorization_service_api_management,feature_flags,file_locks,geo,github_project_service_integration,group_allowed_email_domains,group_project_templates,group_saml,issues_analytics,jira_dev_panel_integration,ldap_group_sync_filter,merge_pipelines,merge_request_performance_metrics,merge_trains,metrics_reports,multiple_approval_rules,multiple_clusters,multiple_group_issue_boards,object_storage,operations_dashboard,packages,productivity_analytics,project_aliases,protected_environments,reject_unsigned_commits,required_ci_templates,scoped_labels,service_desk,smartcard_auth,group_timelogs,type_of_work_analytics,unprotection_restrictions,ci_project_subscriptions,cluster_health,container_scanning,dast,dependency_scanning,epics,group_ip_restriction,incident_management,insights,license_management,personal_access_token_expiration_policy,pod_logs,prometheus_alerts,pseudonymizer,report_approver_rules,sast,security_dashboard,tracing,web_ide_terminal
+++ export GITLAB_FEATURES=audit_events,burndown_charts,code_owners,contribution_analytics,description_diffs,elastic_search,group_bulk_edit,group_burndown_charts,group_webhooks,issuable_default_templates,issue_weights,jenkins_integration,ldap_group_sync,member_lock,merge_request_approvers,multiple_issue_assignees,multiple_ldap_servers,multiple_merge_request_assignees,protected_refs_for_users,push_rules,related_issues,repository_mirrors,repository_size_limit,scoped_issue_board,usage_quotas,visual_review_app,wip_limits,adjourned_deletion_for_projects_and_groups,admin_audit_log,auditor_user,batch_comments,blocking_merge_requests,board_assignee_lists,board_milestone_lists,ci_cd_projects,cluster_deployments,code_analytics,code_owner_approval_required,commit_committer_check,cross_project_pipelines,custom_file_templates,custom_file_templates_for_namespace,custom_project_templates,custom_prometheus_metrics,cycle_analytics_for_groups,db_load_balancing,default_project_deletion_protection,dependency_proxy,deploy_board,design_management,email_additional_text,extended_audit_events,external_authorization_service_api_management,feature_flags,file_locks,geo,github_project_service_integration,group_allowed_email_domains,group_project_templates,group_saml,issues_analytics,jira_dev_panel_integration,ldap_group_sync_filter,merge_pipelines,merge_request_performance_metrics,merge_trains,metrics_reports,multiple_approval_rules,multiple_clusters,multiple_group_issue_boards,object_storage,operations_dashboard,packages,productivity_analytics,project_aliases,protected_environments,reject_unsigned_commits,required_ci_templates,scoped_labels,service_desk,smartcard_auth,group_timelogs,type_of_work_analytics,unprotection_restrictions,ci_project_subscriptions,cluster_health,container_scanning,dast,dependency_scanning,epics,group_ip_restriction,incident_management,insights,license_management,personal_access_token_expiration_policy,pod_logs,prometheus_alerts,pseudonymizer,report_approver_rules,sast,security_dashboard,tracing,web_ide_terminal
+++ GITLAB_FEATURES=audit_events,burndown_charts,code_owners,contribution_analytics,description_diffs,elastic_search,group_bulk_edit,group_burndown_charts,group_webhooks,issuable_default_templates,issue_weights,jenkins_integration,ldap_group_sync,member_lock,merge_request_approvers,multiple_issue_assignees,multiple_ldap_servers,multiple_merge_request_assignees,protected_refs_for_users,push_rules,related_issues,repository_mirrors,repository_size_limit,scoped_issue_board,usage_quotas,visual_review_app,wip_limits,adjourned_deletion_for_projects_and_groups,admin_audit_log,auditor_user,batch_comments,blocking_merge_requests,board_assignee_lists,board_milestone_lists,ci_cd_projects,cluster_deployments,code_analytics,code_owner_approval_required,commit_committer_check,cross_project_pipelines,custom_file_templates,custom_file_templates_for_namespace,custom_project_templates,custom_prometheus_metrics,cycle_analytics_for_groups,db_load_balancing,default_project_deletion_protection,dependency_proxy,deploy_board,design_management,email_additional_text,extended_audit_events,external_authorization_service_api_management,feature_flags,file_locks,geo,github_project_service_integration,group_allowed_email_domains,group_project_templates,group_saml,issues_analytics,jira_dev_panel_integration,ldap_group_sync_filter,merge_pipelines,merge_request_performance_metrics,merge_trains,metrics_reports,multiple_approval_rules,multiple_clusters,multiple_group_issue_boards,object_storage,operations_dashboard,packages,productivity_analytics,project_aliases,protected_environments,reject_unsigned_commits,required_ci_templates,scoped_labels,service_desk,smartcard_auth,group_timelogs,type_of_work_analytics,unprotection_restrictions,ci_project_subscriptions,cluster_health,container_scanning,dast,dependency_scanning,epics,group_ip_restriction,incident_management,insights,license_management,personal_access_token_expiration_policy,pod_logs,prometheus_alerts,pseudonymizer,report_approver_rules,sast,security_dashboard,tracing,web_ide_terminal
 ++ export CI_PROJECT_ID=17893
 ++ CI_PROJECT_ID=17893
 ++ export CI_PROJECT_NAME=ci-debug-trace

doc/user/project/issues/csv_export.md

-# Export Issues to CSV **(STARTER)**
+# Export Issues to CSV
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1126) in [GitLab Starter 9.0](https://about.gitlab.com/releases/2017/03/22/gitlab-9-0-released/#export-issues-ees-eep).
 

doc/user/project/issues/index.md

@@ -197,7 +197,7 @@ Feature.disable(:save_issuable_health_status)
 - [Bulk edit issues](../bulk_editing.md) - From the Issues List, select multiple issues
   in order to change their status, assignee, milestone, or labels in bulk.
 - [Import issues](csv_import.md)
-- [Export issues](csv_export.md) **(STARTER)**
+- [Export issues](csv_export.md)
 - [Issues API](../../../api/issues.md)
 - Configure an [external issue tracker](../../../integration/external-issue-tracker.md)
   such as Jira, Redmine, or Bugzilla.

ee/app/controllers/ee/projects/issues_controller.rb

@@ -15,7 +15,6 @@ module EE
         alias_method :export_csv_authenticate_user!, :authenticate_user!
 
         before_action :export_csv_authenticate_user!, only: [:export_csv]
-        before_action :check_export_issues_available!, only: [:export_csv]
         before_action :check_service_desk_available!, only: [:service_desk]
         before_action :whitelist_query_limiting_ee, only: [:update]
       end

ee/app/models/license.rb

@@ -16,7 +16,6 @@ class License < ApplicationRecord
     contribution_analytics
     description_diffs
     elastic_search
-    export_issues
     group_activity_analytics
     group_bulk_edit
     group_burndown_charts
@@ -147,7 +146,6 @@ class License < ApplicationRecord
     contribution_analytics
     cross_project_pipelines
     deploy_board
-    export_issues
     file_locks
     group_webhooks
     issuable_default_templates

ee/app/views/projects/issues/export_csv/_button.html.haml

-- if (current_user && @project.feature_available?(:export_issues)) || show_promotions?
+- if current_user
   %button.csv_download_link.btn.has-tooltip{ title: _('Export as CSV'),
     data: { toggle: 'modal', target: '.issues-export-modal', qa_selector: 'export_as_csv_button' } }
     = sprite_icon('export')

ee/app/views/projects/issues/export_csv/_modal.html.haml

-- if current_user && @project.feature_available?(:export_issues)
+- if current_user
   .issues-export-modal.modal
     .modal-dialog
       .modal-content{ data: { qa_selector: 'export_issues_modal' } }

ee/app/views/shared/promotions/_promote_csv_export.html.haml

@@ -9,10 +9,7 @@
             = custom_icon('icon_export_issues')
         .user-callout-copy
           %h4
-            - if Gitlab::CurrentSettings.should_check_namespace_plan?
-              Upgrade your plan to export issues.
-            - else
-              Export issues with GitLab Enterprise Edition.
+            Export issues with GitLab Enterprise Edition.
           %p
             Export Issues to CSV enables you and your team to export all the data collected from issues into a comma-separated values (CSV) file, which stores tabular data in plain text.
             = link_to 'Read more', help_page_path('user/project/issues/csv_export.html'), target: '_blank'

ee/changelogs/unreleased/issue_212330.yml

+---
+title: Enable export issues feature for all tiers on Enterprise Edition
+merge_request: 28675
+author:
+type: changed

ee/spec/controllers/projects/issues_controller_spec.rb

@@ -10,7 +10,6 @@ describe Projects::IssuesController do
   describe 'POST export_csv' do
     let(:viewer)            { user }
     let(:issue)             { create(:issue, project: project) }
-    let(:globally_licensed) { false }
 
     before do
       project.add_developer(user)
@@ -18,26 +17,13 @@ describe Projects::IssuesController do
       sign_in(viewer) if viewer
 
       allow(License).to receive(:feature_available?).and_call_original
-      allow(License).to receive(:feature_available?).with(:export_issues).and_return(globally_licensed)
     end
 
     def request_csv
       post :export_csv, params: { namespace_id: project.namespace.to_param, project_id: project.to_param }
     end
 
-    context 'unlicensed' do
-      it 'returns 404' do
-        expect(ExportCsvWorker).not_to receive(:perform_async)
-
-        request_csv
-
-        expect(response).to have_gitlab_http_status(:not_found)
-      end
-    end
-
     context 'globally licensed' do
-      let(:globally_licensed) { true }
-
       it 'allows CSV export' do
         expect(ExportCsvWorker).to receive(:perform_async).with(viewer.id, project.id, anything)
 
@@ -61,7 +47,6 @@ describe Projects::IssuesController do
     end
 
     context 'licensed by namespace' do
-      let(:globally_licensed) { true }
       let(:namespace) { create(:group, :private) }
       let!(:gitlab_subscriptions) { create(:gitlab_subscription, :bronze, namespace: namespace) }
       let(:project) { create(:project, namespace: namespace) }

ee/spec/features/promotion_spec.rb

@@ -219,24 +219,6 @@ describe 'Promotions', :js do
     end
   end
 
-  describe 'for issue export', :js do
-    before do
-      allow(License).to receive(:current).and_return(nil)
-      stub_application_setting(check_namespace_plan: false)
-
-      project.add_maintainer(user)
-      sign_in(user)
-    end
-
-    it 'appears on export modal' do
-      visit project_issues_path(project)
-
-      click_on 'Export as CSV'
-
-      expect(find('.issues-export-modal')).to have_content 'Export issues with GitLab Enterprise Edition.'
-    end
-  end
-
   describe 'for epics in issues sidebar', :js do
     shared_examples 'Epics promotion' do
       it 'appears on the page' do