summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'expose-commits-mr-api' into 'master'Rémy Coutable2018-03-281-0/+14
|\ | | | | | | | | Allow merge requests related to a commit to be found via API See merge request gitlab-org/gitlab-ce!18004
| * Allow merge requests related to a commit to be found via APIMark Fletcher2018-03-261-0/+14
| | | | | | | | | | - Original work for the web interface here: - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13713
* | Merge branch 'jej/add-protected-branch-policy' into 'master'Nick Thomas2018-03-271-1/+4
|\ \ | | | | | | | | | | | | Add protected branch policy See merge request gitlab-org/gitlab-ce!17982
| * | API uses ProtectedBranchPolicy for destroy/createJames Edwards-Jones2018-03-261-1/+4
| | |
* | | Merge branch '40781-os-to-ce' into 'master'Sean McGivern2018-03-276-14/+19
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Bring Object Storage to CE Closes #4171, #4163, #3370, #2841, and #29203 See merge request gitlab-org/gitlab-ce!17358
| * | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-225-6/+11
| |\ \ | | |/
| * | Add proxy_download to perform proxied sending of all filesMicaël Bergeron2018-03-096-16/+16
| | |
| * | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-0824-166/+863
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into ↵object-storage-ee-to-ce-backportKamil Trzciński2018-02-2815-26/+216
| |\ \ \ | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * \ \ \ Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into ↵Kamil Trzciński2018-02-2822-44/+231
| |\ \ \ \ | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * \ \ \ \ Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-2837-108/+264
| |\ \ \ \ \
| | * | | | | Revert "Merge branch '3867-port-to-ce' into 'master'"Kamil Trzciński2018-02-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 54a575f1bbba44573ab92dc58a4242f1ee734c5d, reversing changes made to c63af942e5baf7849a94fa99da8494bcba28e3f8.
| * | | | | | Merge branch 'use-send-url-for-incompatible-runners' into 'master'Grzegorz Bizon2018-02-282-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support SendURL for performing indirect download of artifacts if clients does… See merge request gitlab-org/gitlab-ee!4401
| * | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master'Sean McGivern2018-02-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move uploads to object storage Closes #4163 See merge request gitlab-org/gitlab-ee!3867
| * | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into ↵Kamil Trzciński2018-02-2817-117/+346
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * \ \ \ \ \ \ Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into ↵Kamil Trzciński2018-02-2834-208/+419
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * \ \ \ \ \ \ \ Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into ↵Kamil Trzciński2018-02-2819-189/+324
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * \ \ \ \ \ \ \ \ Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into ↵Kamil Trzciński2018-02-2825-130/+270
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * \ \ \ \ \ \ \ \ \ Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into ↵Kamil Trzciński2018-02-2864-316/+888
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * \ \ \ \ \ \ \ \ \ \ Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into ↵Kamil Trzciński2018-02-2845-381/+940
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport
| * | | | | | | | | | | | Merge branch 'zj-object-store-artifacts' into 'master'Grzegorz Bizon2018-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Object store for artifacts Closes gitlab-ce#29203 See merge request !1762
* | | | | | | | | | | | | ProtectedBranch API omits empty declared paramsJames Edwards-Jones2018-03-261-1/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Resolve "Forking with namespace doesn't work (API)"Jan2018-03-262-10/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Updated grape to `1.0.2` to remove workaround40843-update-grape-to-v1-0-2-when-it-is-releasedJames Edwards-Jones2018-03-261-6/+1
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Send Gitaly payload for git-upload-archive SSH commandsAlejandro Rodríguez2018-03-211-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'issue_25542' into 'master'Sean McGivern2018-03-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve JIRA event descriptions Closes #25542 See merge request gitlab-org/gitlab-ce!17811
| * | | | | | | | | | | | Improve JIRA event descriptionsissue_25542Felipe Artur2018-03-191-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Optional '/-/' delimiter for search APIJan Provaznik2018-03-191-2/+2
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '/-/' delimiter is used only in UI, in API we don't use it for other endpoints. To align search endpoints with the rest of API endpoints, this patch makes '/-/' optional for existing endpoints (to keep backward compatibility). Documentation is updated to prefer paths without '/-/'.
* | | | | | | | | | | | Adds the option to override project description on export via APITiago Botelho2018-03-161-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and fixes the project description not being imported
* | | | | | | | | | | | Respect the protocol in `expose_url`Toon Claes2018-03-121-1/+1
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When https is configured in the URL, also use that, and do not set it to http. Closes gitlab-org/gitlab-ee#5217
* | | | | | | | | | | Merge branch 'bvl-allow-maintainer-to-push' into 'master'Douwe Maan2018-03-072-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow maintainers to push forks of a project for branches that have open MRs Closes #22292 See merge request gitlab-org/gitlab-ce!17395
| * | | | | | | | | | | Add documentation for allowing maintainers to pushBob Van Landuyt2018-03-071-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Set `allow_maintainer_to_push` using the APIBob Van Landuyt2018-03-072-0/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'gitaly-git-mandatory' into 'master'Douwe Maan2018-03-071-7/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make git push mandatory See merge request gitlab-org/gitlab-ce!17565
| * | | | | | | | | | | Make git push mandatoryKim "BKC" Carlbäcker2018-03-061-7/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'jprovazn-api' into 'master'Sean McGivern2018-03-075-66/+307
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add discussion API See merge request gitlab-org/gitlab-ce!17510
| * | | | | | | | | | | | Add discussion APIjprovazn-apiJan Provaznik2018-03-075-66/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adds basic discussions API for issues and snippets * reorganizes notes specs (so same tests can be used for all noteable types - issues, MRs, snippets)
* | | | | | | | | | | | | Merge branch 'issue_38337' into 'master'Sean McGivern2018-03-062-0/+118
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring one group board to CE Closes #38337 See merge request gitlab-org/gitlab-ce!17274
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-0610-7/+271
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/group.rb # db/schema.rb
| * | | | | | | | | | | | | | Address review commentsFelipe Artur2018-03-051-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Bring one group board to CEFelipe Artur2018-03-032-0/+118
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'prepend-grape-api-ce' into 'master'Rémy Coutable2018-03-061-21/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify lib/api/merge_requests.rb with EE See merge request gitlab-org/gitlab-ce!17539
| * | | | | | | | | | | | | Unify lib/api/merge_requests.rb with EEprepend-grape-api-ceLin Jen-Shin2018-03-061-21/+40
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'extract-job-artifacts-api-ce' into 'master'Rémy Coutable2018-03-061-4/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify lib/api/job_artifacts.rb with EE See merge request gitlab-org/gitlab-ce!17556
| * | | | | | | | | | | | | | Unify lib/api/job_artifacts.rb with EEextract-job-artifacts-api-ceLin Jen-Shin2018-03-061-4/+13
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '29130-api-project-export' into 'master'Sean McGivern2018-03-063-0/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "API endpoint for exporting project" Closes #29130 See merge request gitlab-org/gitlab-ce!15860
| * | | | | | | | | | | | | review: prefix un-used argument with underscoreTravis Miller2018-03-051-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | review: remove un-necessary current_application_settingsTravis Miller2018-02-281-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | review: add feature introduction detailTravis Miller2018-02-281-2/+7
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add project export API implementationTravis Miller2018-02-282-0/+37
| | | | | | | | | | | | | |
View Lorry Controller Status