summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * New AccessRequests API endpoints for Group & ProjectRémy Coutable2016-08-108-229/+253
| * | Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slackLin Jen-Shin2016-08-115-44/+74
| |\ \ | | |/
| | * Clean up project destructionclean-up-project-destroyStan Hu2016-08-101-1/+1
| | * Retain old behaviorConnor Shea2016-08-091-2/+4
| | * Merge branch 'zj-enable-deploy-keys-api' into 'master' Douwe Maan2016-08-081-38/+66
| | |\
| | | * Namespace EnableDeployKeyService under ProjectsZ.J. van de Weg2016-08-081-1/+2
| | | * Create service for enabling deploy keysZ.J. van de Weg2016-08-051-3/+3
| | | * Move deploy_key tests to deploy_key_spec.rbZ.J. van de Weg2016-08-041-5/+6
| | | * Use Grape DSL for deploy keys endpointsZ.J. van de Weg2016-08-031-39/+34
| | | * Endpoints to enable and disable deploy keysZ.J. van de Weg2016-08-031-0/+31
| | * | switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-032-3/+3
| | |/
| * | Implement pipeline hooks, extracted from !5525Lin Jen-Shin2016-08-022-2/+6
| |/
| * Minor fixes in the Env API endpointszj-env-external-urlZ.J. van de Weg2016-08-011-1/+5
| * Use Grape DSL for environment endpointsZ.J. van de Weg2016-07-292-48/+47
| * Incorporate feedbackZ.J. van de Weg2016-07-291-4/+1
| * Add API support for environmentsZ.J. van de Weg2016-07-293-0/+92
* | Add API support for expires_at.Adam Niedzielski2016-08-062-3/+9
|/
* Use `Gitlab::Access` to protected branch access levels.Timothy Andrew2016-07-292-11/+29
* Have the `branches` API work with the new protected branches data model.Timothy Andrew2016-07-292-14/+21
View Lorry Controller Status