Skip to content
Snippets Groups Projects
Commit 3814ce80 authored by Eric Eastwood's avatar Eric Eastwood
Browse files

Merge branch 'service-desk-endpoint' into 'master'

Add service desk endpoint

See merge request !1
parents 1ca18078 1b5105c3
No related branches found
No related tags found
1 merge request!1Add service desk endpoint
Pipeline #13103540 failed
Loading
@@ -22,7 +22,7 @@
Loading
@@ -22,7 +22,7 @@
"bluebird": "^3.4.7", "bluebird": "^3.4.7",
"cors": "^2.8.1", "cors": "^2.8.1",
"express": "^4.14.0", "express": "^4.14.0",
"spectacle-docs": "^0.7.0", "spectacle-docs": "^0.7.4",
"swagger-express-middleware": "^1.0.0-alpha.12", "swagger-express-middleware": "^1.0.0-alpha.12",
"swagmock": "^1.0.0" "swagmock": "^1.0.0"
}, },
Loading
Loading
Loading
@@ -90,6 +90,10 @@ definitions:
Loading
@@ -90,6 +90,10 @@ definitions:
type: string type: string
minLength: 1 minLength: 1
   
default-incoming-service-desk-email-response:
default:
incomingEmail: incoming+gitlab-org/gitlab-ee@gitlan.com
   
parameters: parameters:
userId: userId:
Loading
@@ -227,6 +231,19 @@ paths:
Loading
@@ -227,6 +231,19 @@ paths:
$ref: "#/definitions/snippet" $ref: "#/definitions/snippet"
   
   
/some-project/fetch-incoming-service-desk-email:
get:
description: Returns the interal incoming service desk email, see https://gitlab.com/gitlab-org/gitlab-ee/issues/149
tags:
- Projects
responses:
default:
description: Returns the service desk incoming email
schema:
$ref: "#/definitions/default-incoming-service-desk-email-response"
/pets: /pets:
get: get:
description: Returns all pets, optionally filtered by one or more criteria description: Returns all pets, optionally filtered by one or more criteria
Loading
Loading
yarn.lock 0 → 100644
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment