Merge branch '414255-feature-flag-enable-feedback-link-for-gitlab-for-jira-cloud-app' into 'master'

Remove jira_for_cloud_app_feedback_link feature flag

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126712



Merged-by: Luke Duncalfe <lduncalfe@gitlab.com>
Approved-by: Bojan Marjanovic <bmarjanovic@gitlab.com>
Approved-by: Luke Duncalfe <lduncalfe@gitlab.com>
Co-authored-by: Martin Wortschack <mwortschack@gitlab.com>

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/'
 

config/feature_flags/development/jira_for_cloud_app_feedback_link.yml

----
-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

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