diff --git a/app/controllers/jira_connect/app_descriptor_controller.rb b/app/controllers/jira_connect/app_descriptor_controller.rb index 2c498820a1e0be6b9e1ea8576e9a30e39cb0ced2..3c50d54fa10a96cee3e043c1d191ca4d6d2dcde2 100644 --- a/app/controllers/jira_connect/app_descriptor_controller.rb +++ b/app/controllers/jira_connect/app_descriptor_controller.rb @@ -8,7 +8,7 @@ class JiraConnect::AppDescriptorController < JiraConnect::ApplicationController skip_before_action :verify_atlassian_jwt! def show - result = { + render json: { name: Atlassian::JiraConnect.app_name, description: 'Integrate commits, branches and merge requests from GitLab into Jira', key: Atlassian::JiraConnect.app_key, @@ -36,15 +36,10 @@ def show gdpr: true } } - - result[:links][:feedback] = URI.join(HOME_URL, FEEDBACK_URL) if Feature.enabled?(:jira_for_cloud_app_feedback_link) - - render json: result end private - FEEDBACK_URL = '/gitlab-org/gitlab/-/issues/413652' HOME_URL = 'https://gitlab.com' DOC_URL = 'https://docs.gitlab.com/ee/integration/jira/' diff --git a/config/feature_flags/development/jira_for_cloud_app_feedback_link.yml b/config/feature_flags/development/jira_for_cloud_app_feedback_link.yml deleted file mode 100644 index 0b55a1f34fa897ff3033bc17285858d0f48e066a..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/jira_for_cloud_app_feedback_link.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: jira_for_cloud_app_feedback_link -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122419 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/414255 -milestone: '16.1' -type: development -group: group::import and integrate -default_enabled: false diff --git a/spec/controllers/jira_connect/app_descriptor_controller_spec.rb b/spec/controllers/jira_connect/app_descriptor_controller_spec.rb index 3c9d495c33cd1fa5b7b8da4f73e93e2615435098..48b315646de0151c5d849f7b11794353bb147ea8 100644 --- a/spec/controllers/jira_connect/app_descriptor_controller_spec.rb +++ b/spec/controllers/jira_connect/app_descriptor_controller_spec.rb @@ -37,8 +37,7 @@ url: 'https://gitlab.com' }, links: { - documentation: 'http://test.host/help/integration/jira_development_panel#gitlabcom-1', - feedback: 'https://gitlab.com/gitlab-org/gitlab/-/issues/413652' + documentation: 'http://test.host/help/integration/jira_development_panel#gitlabcom-1' }, authentication: { type: 'jwt' @@ -91,19 +90,5 @@ ) ) end - - context 'when feature flag jira_for_cloud_app_feedback_link is disabled' do - before do - stub_feature_flags(jira_for_cloud_app_feedback_link: false) - end - - it 'does not include the feedback link' do - get :show - - expect(descriptor[:links]).not_to include( - feedback: 'https://gitlab.com/gitlab-org/gitlab/-/issues/413652' - ) - end - end end end