summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dz-merge-request-version'Douwe Maan2016-08-253-0/+59
|\
| * Fix merge request diff apiDmitriy Zaporozhets2016-08-221-1/+1
| * Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-222-3/+10
| |\
| * \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1910-29/+200
| |\ \
| * \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1513-278/+363
| |\ \ \
| * | | | Add single merge request diff API endpointDmitriy Zaporozhets2016-08-122-0/+21
| * | | | Fix project id param for merge request version APIDmitriy Zaporozhets2016-08-031-2/+2
| * | | | Update merge request versions API to match styleguideDmitriy Zaporozhets2016-08-031-9/+10
| * | | | Add API to list merge request diff versionsDmitriy Zaporozhets2016-08-033-0/+37
* | | | | Merge branch 'internal_recovery_api' into 'master' Robert Speicher2016-08-241-0/+25
|\ \ \ \ \
| * | | | | Add two factor recovery endpoint to internal APIDrew Blessing2016-08-241-0/+25
* | | | | | Merge branch 'add-sentry-logging-to-api' into 'master' Robert Speicher2016-08-242-10/+34
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add Sentry logging to API callsadd-sentry-logging-to-apiStan Hu2016-08-242-10/+34
* | | | | | Merge branch 'api_only_allow_merge_if_build_succeeds' into 'master' Douwe Maan2016-08-242-3/+7
|\ \ \ \ \ \
| * | | | | | expose 'only_allow_merge_if_build_succeeds' project setting in the APIMarc Dequènes (Duck)2016-08-242-3/+7
* | | | | | | Merge branch 'entity-api-web-url' into 'master' Douwe Maan2016-08-241-0/+12
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | api: expose web_url for project entitiesBen Boeckel2016-08-241-0/+12
| |/ / / / /
* | | | | | api: expose wiki_page_events project hook field in the APIBen Boeckel2016-08-242-1/+3
|/ / / / /
* | | | | entities: make Environment inherit EnvironmentBasicBen Boeckel2016-08-231-4/+3
| |_|_|/ |/| | |
* | | | Merge branch 'master' into expiration-date-on-membershipsDouwe Maan2016-08-181-0/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Small refactor and syntax fixes.2fa-api-checkPatricio Cano2016-08-182-5/+1
| * | | Removed unnecessary service for user retrieval and improved API error message.Patricio Cano2016-08-181-1/+1
| * | | Added checks for 2FA to the API `/sessions` endpoint and the Resource Owner P...Patricio Cano2016-08-182-0/+5
* | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-185-0/+157
|\ \ \ \ | |/ / /
| * | | Do not expose projects on deploymentsZ.J. van de Weg2016-08-181-4/+3
| * | | Incorporate feedbackZ.J. van de Weg2016-08-181-8/+6
| * | | Expose project for environmentsZ.J. van de Weg2016-08-181-0/+1
| * | | Add deployment endpointsZ.J. van de Weg2016-08-183-0/+53
| * | | Add Play endpoints on BuildsZ.J. van de Weg2016-08-181-0/+23
| * | | Add docs on API for pipelines, plus minor fixeszj-pipelines-api-endpointsZ.J. van de Weg2016-08-181-1/+1
| * | | Add endpoints for pipelinesZ.J. van de Weg2016-08-183-0/+83
* | | | Add expiration date to group membershipsSean McGivern2016-08-182-6/+9
* | | | Merge branch 'master' into expiration-date-on-membershipsSean McGivern2016-08-1818-308/+496
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into pipeline-hooks-...Kamil Trzcinski2016-08-164-27/+36
| |\ \ \
| | * \ \ Merge branch 'issue_18656' into 'master' Douwe Maan2016-08-161-11/+15
| | |\ \ \
| | | * | | Load issues and merge requests templates from repositoryFelipe Artur2016-08-161-11/+15
| | * | | | Fix failing tests relating to backporting ee!581.Timothy Andrew2016-08-161-12/+17
| | * | | | Improve EE compatibility with protected branch access levels.Timothy Andrew2016-08-161-2/+4
| | * | | | Backport changes from gitlab-org/gitlab-ee!581 to CE.Timothy Andrew2016-08-161-2/+2
| | |/ / /
| | * | | Refactored AkismetHelper into AkismetService and cleaned up `Spammable`Patricio Cano2016-08-151-2/+0
| | * | | Refactored spam related code even furtherPatricio Cano2016-08-151-1/+1
| | * | | Complete refactor of the `Spammable` concern and tests:Patricio Cano2016-08-151-1/+1
| | | |/ | | |/|
| * | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-151-5/+3
| |\ \ \ | | |/ /
| | * | Recover usage of Todos counter cache20842-todos-queries-cachePaco Guzman2016-08-121-4/+2
| | * | Use cache for todos counter calling TodoServicePaco Guzman2016-08-121-1/+1
| * | | Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slackKamil Trzcinski2016-08-121-0/+4
| |\ \ \ | | |/ /
| | * | api for generating new merge requestScott Le2016-08-111-0/+4
| * | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-118-229/+282
| |\ \ \ | | |/ /
| | * | Improve the performance of the GET /:sources/:id/{access_requests,members} AP...Rémy Coutable2016-08-103-8/+7
| | * | Restore back-compatibility for current members API endpointsRémy Coutable2016-08-102-8/+38