diff --git a/config/feature_flags/development/jira_deployment_issue_keys.yml b/config/feature_flags/development/jira_deployment_issue_keys.yml deleted file mode 100644 index e2b9db8020deee811a27500530be507c6914be1f..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/jira_deployment_issue_keys.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: jira_deployment_issue_keys -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123455 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/415025 -milestone: '16.2' -type: development -group: group::import and integrate -default_enabled: true diff --git a/doc/integration/jira/development_panel.md b/doc/integration/jira/development_panel.md index c444ffe8a3b36bdf3073451eeb904126229b9af7..4ce693dcb58f9274840aadea488bbe0b42f90bce 100644 --- a/doc/integration/jira/development_panel.md +++ b/doc/integration/jira/development_panel.md @@ -49,11 +49,16 @@ depends on where you mention the Jira issue ID in GitLab. | GitLab: where you mention the Jira issue ID | Jira development panel: what information is displayed | |------------------------------------------------|-------------------------------------------------------| -| Merge request title or description | Link to the merge request<br>Link to the deployment<br>Link to the pipeline by title only and by description ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/390888) in GitLab 15.10)<br>Link to the branch ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/354373) in GitLab 15.11) | +| Merge request title or description | Link to the merge request<br>Link to the deployment<br>Link to the pipeline through merge request title<br>Link to the pipeline through merge request description <sup>1</sup><br>Link to the branch <sup>2</sup> | | Branch name | Link to the branch<br>Link to the deployment | -| Commit message | Link to the commit<br>Link to the deployment from up to 5,000 commits after the last successful deployment to the environment ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/300031) in GitLab 16.2 [with a flag](../../administration/feature_flags.md) named `jira_deployment_issue_keys`. Enabled by default) | +| Commit message | Link to the commit<br>Link to the deployment from up to 5,000 commits after the last successful deployment to the environment <sup>3</sup> <sup>4</sup> | | [Jira Smart Commit](#jira-smart-commits) | Custom comment, logged time, or workflow transition | +1. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/390888) in GitLab 15.10. +1. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/354373) in GitLab 15.11. +1. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/300031) in GitLab 16.2 [with a flag](../../administration/feature_flags.md) named `jira_deployment_issue_keys`. Enabled by default. +1. [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/415025) in GitLab 16.3. Feature flag `jira_deployment_issue_keys` removed. + ## Jira Smart Commits Prerequisites: diff --git a/lib/atlassian/jira_connect/serializers/deployment_entity.rb b/lib/atlassian/jira_connect/serializers/deployment_entity.rb index 96e7b1726cb9c4d197ba0e086e75644e50adf2bc..1feb8a60f738f2cb16a851050e917c7ab80a251e 100644 --- a/lib/atlassian/jira_connect/serializers/deployment_entity.rb +++ b/lib/atlassian/jira_connect/serializers/deployment_entity.rb @@ -98,8 +98,6 @@ def issue_keys_from_pipeline # Extract Jira issue keys from commits made to the deployment's branch or tag # since the last successful deployment was made to the environment. def issue_keys_from_commits_since_last_deploy - return [] if Feature.disabled?(:jira_deployment_issue_keys, project) - last_deployed_commit = environment .successful_deployments .id_not_in(deployment.id) diff --git a/spec/lib/atlassian/jira_connect/serializers/deployment_entity_spec.rb b/spec/lib/atlassian/jira_connect/serializers/deployment_entity_spec.rb index 57e0b67e9e690a5ad6ddb6f403b28330d3d7df79..45ede09c7bb5de2b98cde64d36583c6718017c5f 100644 --- a/spec/lib/atlassian/jira_connect/serializers/deployment_entity_spec.rb +++ b/spec/lib/atlassian/jira_connect/serializers/deployment_entity_spec.rb @@ -92,16 +92,6 @@ expect(subject.issue_keys).to contain_exactly('add a') end - context 'when `jira_deployment_issue_keys` flag is disabled' do - before do - stub_feature_flags(jira_deployment_issue_keys: false) - end - - it 'does not extract issue keys from commits' do - expect(subject.issue_keys).to be_empty - end - end - context 'when deploy happened at an older commit' do before do # SHA is from a commit between 1) and 2) in the commit list above.