Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c9ccfc65
Commit
c9ccfc65
authored
Aug 01, 2018
by
Oswaldo Ferreira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adjust self-hosted Jira development panel integration
parent
7a610b64
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
0 deletions
+22
-0
ee/changelogs/unreleased/osw-adjust-self-hosted-jira-dev-panel-integration.yml
...sed/osw-adjust-self-hosted-jira-dev-panel-integration.yml
+5
-0
ee/lib/api/v3/github.rb
ee/lib/api/v3/github.rb
+8
-0
ee/spec/requests/api/v3/github_spec.rb
ee/spec/requests/api/v3/github_spec.rb
+9
-0
No files found.
ee/changelogs/unreleased/osw-adjust-self-hosted-jira-dev-panel-integration.yml
0 → 100644
View file @
c9ccfc65
---
title
:
Adjust self-hosted Jira development panel integration
merge_request
:
6756
author
:
type
:
fixed
ee/lib/api/v3/github.rb
View file @
c9ccfc65
...
...
@@ -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
View file @
c9ccfc65
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment