summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
* Extend API for importing a project export with overwrite supportFrancisco Javier López2018-04-061-1/+3
|
* Merge branch 'jramsay-38830-tarball' into 'master'Douwe Maan2018-04-063-4/+4
|\ | | | | | | | | | | | | Add alternative archive route Closes #38830 See merge request gitlab-org/gitlab-ce!17225
| * Add option to suppress archive commit shaJames Ramsay2018-04-043-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Repository archives are always named `<project>-<ref>-<sha>` even if the ref is a commit. A consequence of always including the sha even for tags is that packaging a release is more difficult because both the ref and sha must be known by the packager. - add append_sha option (defaults true) to provide a method for toggling this feature. Support added to GitLab Workhorse by gitlab-org/gitlab-workhorse!232
* | Merge branch 'issue_42443' into 'master'Sean McGivern2018-04-061-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Include subgroup issues when searching for group issues using the API Closes #42443 See merge request gitlab-org/gitlab-ce!18068
| * | Include subgroup issues when searching for group issues using the APIissue_42443Felipe Artur2018-04-051-1/+1
| | |
* | | Merge branch 'direct-upload-of-artifacts' into 'master'Grzegorz Bizon2018-04-053-33/+33
|\ \ \ | | | | | | | | | | | | | | | | Direct upload of artifacts See merge request gitlab-org/gitlab-ce!18160
| * | | Add `direct_upload` setting for artifactsdirect-upload-of-artifactsKamil Trzciński2018-04-053-33/+33
| | |/ | |/|
* | | Merge branch 'bvl-override-import-params' into 'master'Douwe Maan2018-04-053-31/+53
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow passing params to import API to override project attributes Closes gitlab-ee#4788 See merge request gitlab-org/gitlab-ce!18086
| * | | Store override params as import data on projectsBob Van Landuyt2018-04-041-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means import data doesn't necessarily have to have an import_url anymore. The `ProjectImportData` could just contain the override data in it's serialized data attribute. The import data is automatically cleaned up after it is finished by the state machine.
| * | | Make the API project params reusableBob Van Landuyt2018-04-042-30/+42
| | | |
* | | | Merge branch 'jej/mattermost-notification-confidentiality-10-6' into ↵Douwe Maan2018-04-052-2/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | 'security-10-6' [10.6] Prevent notes on confidential issues from being sent to chat See merge request gitlab/gitlabhq!2366 # Conflicts: # app/helpers/services_helper.rb
* | | Allow assigning and filtering issuables by ancestor group labelsFelipe Artur2018-04-041-6/+7
| | |
* | | Merge branch 'zj-feature-gate-remove-http-api' into 'master'Douwe Maan2018-04-041-0/+7
|\ \ \ | |/ / |/| | | | | | | | Allow feature gate removal through the API See merge request gitlab-org/gitlab-ce!18146
| * | Allow feature gate removal through the APIzj-feature-gate-remove-http-apiZeger-Jan van de Weg2018-04-031-0/+7
| | | | | | | | | | | | | | | | | | Features could be listed and added through the api, now also removed. This was needed in the case of gitlab.com as the number of gates that were ever used just grows and cleaning up is hard.
* | | Resolve "Allow the configuration of a project's merge method via the API"Jan2018-04-042-0/+3
| | |
* | | Store metadata checksum for artifacts43745-store-metadata-checksum-for-artifactsShinya Maeda2018-04-031-1/+2
|/ /
* | Extend API for exporting a project with direct upload URLFrancisco Javier López2018-03-301-1/+18
| |
* | Merge branch '41967_issue_api_closed_by_info' into 'master'Sean McGivern2018-03-301-0/+1
|\ \ | | | | | | | | | | | | Add closed by information to issue API See merge request gitlab-org/gitlab-ce!17042
| * | closed by field addedhaseeb2018-02-281-0/+1
| | |
* | | Remove support for absolute dirs from Git::EnvJacob Vosmaer (GitLab)2018-03-302-14/+1
| | |
* | | Merge branch 'add-per-runner-job-timeout' into 'master'Kamil Trzciński2018-03-293-2/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add per runner job timeout Closes #43426 See merge request gitlab-org/gitlab-ce!17221
| * | | Remove Ci::Build#timeoutTomasz Maczukin2018-03-281-1/+1
| | | |
| * | | Use raw value of maximum_timeout for Runner registration APITomasz Maczukin2018-03-281-3/+2
| | | |
| * | | Rename maximum_job_timeout to maximum_timeoutTomasz Maczukin2018-03-283-4/+4
| | | |
| * | | Update runner registration APITomasz Maczukin2018-03-281-2/+3
| | | |
| * | | Use _human_readable for Runner's registration APITomasz Maczukin2018-03-281-2/+2
| | | |
| * | | Rename job_upper_timeout to maximum_job_timeoutTomasz Maczukin2018-03-283-4/+4
| | | |
| * | | Add support for job_upper_timeout in APITomasz Maczukin2018-03-283-1/+4
| | |/ | |/|
* | | Merge branch 'dm-deploy-keys-default-user' into 'master'Sean McGivern2018-03-291-12/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ensure hooks run when a deploy key without a user pushes Closes #44317 See merge request gitlab-org/gitlab-ce!18057
| * | | Set user when adding deploy key to project using APIDouwe Maan2018-03-281-12/+11
| | | |
* | | | 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