Merge branch 'osw-adjust-self-hosted-jira-dev-panel-integration' into 'master'

Adjust self-hosted Jira development panel integration

Closes #6811

See merge request gitlab-org/gitlab-ee!6756

ee/changelogs/unreleased/osw-adjust-self-hosted-jira-dev-panel-integration.yml

+---
+title: Adjust self-hosted Jira development panel integration
+merge_request: 6756
+author:
+type: fixed

ee/lib/api/v3/github.rb

@@ -125,6 +125,14 @@ module API
           present []
         end
 
+        # Self-hosted Jira (tested on 7.11.1) requests this endpoint right
+        # after fetching branches.
+        # We need to respond with a 200 request to avoid breaking the
+        # integration flow (fetching merge requests).
+        get '/-/jira/events' do
+          present []
+        end
+
         params do
           use :project_full_path
           use :pagination

ee/spec/requests/api/v3/github_spec.rb

@@ -37,6 +37,15 @@ describe API::V3::Github do
     end
   end
 
+  describe 'GET /repos/-/jira/events' do
+    it 'returns an empty array' do
+      get v3_api('/repos/-/jira/events', user)
+
+      expect(response).to have_gitlab_http_status(200)
+      expect(json_response).to eq([])
+    end
+  end
+
   describe 'GET /-/jira/pulls' do
     let(:assignee) { create(:user) }
     let!(:merge_request) do