Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Extend API for importing a project export with overwrite support | Francisco Javier López | 2018-04-06 | 1 | -1/+3 |
| | |||||
* | Merge branch 'jramsay-38830-tarball' into 'master' | Douwe Maan | 2018-04-06 | 3 | -4/+4 |
|\ | | | | | | | | | | | | | Add alternative archive route Closes #38830 See merge request gitlab-org/gitlab-ce!17225 | ||||
| * | Add option to suppress archive commit sha | James Ramsay | 2018-04-04 | 3 | -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 McGivern | 2018-04-06 | 1 | -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_42443 | Felipe Artur | 2018-04-05 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'direct-upload-of-artifacts' into 'master' | Grzegorz Bizon | 2018-04-05 | 3 | -33/+33 |
|\ \ \ | | | | | | | | | | | | | | | | | Direct upload of artifacts See merge request gitlab-org/gitlab-ce!18160 | ||||
| * | | | Add `direct_upload` setting for artifactsdirect-upload-of-artifacts | Kamil Trzciński | 2018-04-05 | 3 | -33/+33 |
| | |/ | |/| | |||||
* | | | Merge branch 'bvl-override-import-params' into 'master' | Douwe Maan | 2018-04-05 | 3 | -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 projects | Bob Van Landuyt | 2018-04-04 | 1 | -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 reusable | Bob Van Landuyt | 2018-04-04 | 2 | -30/+42 |
| | | | | |||||
* | | | | Merge branch 'jej/mattermost-notification-confidentiality-10-6' into ↵ | Douwe Maan | 2018-04-05 | 2 | -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 labels | Felipe Artur | 2018-04-04 | 1 | -6/+7 |
| | | | |||||
* | | | Merge branch 'zj-feature-gate-remove-http-api' into 'master' | Douwe Maan | 2018-04-04 | 1 | -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-api | Zeger-Jan van de Weg | 2018-04-03 | 1 | -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" | Jan | 2018-04-04 | 2 | -0/+3 |
| | | | |||||
* | | | Store metadata checksum for artifacts43745-store-metadata-checksum-for-artifacts | Shinya Maeda | 2018-04-03 | 1 | -1/+2 |
|/ / | |||||
* | | Extend API for exporting a project with direct upload URL | Francisco Javier López | 2018-03-30 | 1 | -1/+18 |
| | | |||||
* | | Merge branch '41967_issue_api_closed_by_info' into 'master' | Sean McGivern | 2018-03-30 | 1 | -0/+1 |
|\ \ | | | | | | | | | | | | | Add closed by information to issue API See merge request gitlab-org/gitlab-ce!17042 | ||||
| * | | closed by field added | haseeb | 2018-02-28 | 1 | -0/+1 |
| | | | |||||
* | | | Remove support for absolute dirs from Git::Env | Jacob Vosmaer (GitLab) | 2018-03-30 | 2 | -14/+1 |
| | | | |||||
* | | | Merge branch 'add-per-runner-job-timeout' into 'master' | Kamil Trzciński | 2018-03-29 | 3 | -2/+5 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add per runner job timeout Closes #43426 See merge request gitlab-org/gitlab-ce!17221 | ||||
| * | | | Remove Ci::Build#timeout | Tomasz Maczukin | 2018-03-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | Use raw value of maximum_timeout for Runner registration API | Tomasz Maczukin | 2018-03-28 | 1 | -3/+2 |
| | | | | |||||
| * | | | Rename maximum_job_timeout to maximum_timeout | Tomasz Maczukin | 2018-03-28 | 3 | -4/+4 |
| | | | | |||||
| * | | | Update runner registration API | Tomasz Maczukin | 2018-03-28 | 1 | -2/+3 |
| | | | | |||||
| * | | | Use _human_readable for Runner's registration API | Tomasz Maczukin | 2018-03-28 | 1 | -2/+2 |
| | | | | |||||
| * | | | Rename job_upper_timeout to maximum_job_timeout | Tomasz Maczukin | 2018-03-28 | 3 | -4/+4 |
| | | | | |||||
| * | | | Add support for job_upper_timeout in API | Tomasz Maczukin | 2018-03-28 | 3 | -1/+4 |
| | |/ | |/| | |||||
* | | | Merge branch 'dm-deploy-keys-default-user' into 'master' | Sean McGivern | 2018-03-29 | 1 | -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 API | Douwe Maan | 2018-03-28 | 1 | -12/+11 |
| | | | | |||||
* | | | | Merge branch 'expose-commits-mr-api' into 'master' | Rémy Coutable | 2018-03-28 | 1 | -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 API | Mark Fletcher | 2018-03-26 | 1 | -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 Thomas | 2018-03-27 | 1 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add protected branch policy See merge request gitlab-org/gitlab-ce!17982 | ||||
| * | | | | API uses ProtectedBranchPolicy for destroy/create | James Edwards-Jones | 2018-03-26 | 1 | -1/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge branch '40781-os-to-ce' into 'master' | Sean McGivern | 2018-03-27 | 6 | -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-ce | Micaël Bergeron | 2018-03-22 | 5 | -6/+11 |
| |\ \ \ | | |/ / | |||||
| * | | | Add proxy_download to perform proxied sending of all files | Micaël Bergeron | 2018-03-09 | 6 | -16/+16 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into 40781-os-to-ce | Micaël Bergeron | 2018-03-08 | 24 | -166/+863 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/master' into ↵object-storage-ee-to-ce-backport | Kamil Trzciński | 2018-02-28 | 15 | -26/+216 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| * \ \ \ \ | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into ↵ | Kamil Trzciński | 2018-02-28 | 22 | -44/+231 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| * \ \ \ \ \ | Merge commit '8af23def1d6' into object-storage-ee-to-ce-backport | Kamil Trzciński | 2018-02-28 | 37 | -108/+264 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Revert "Merge branch '3867-port-to-ce' into 'master'" | Kamil Trzciński | 2018-02-28 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 54a575f1bbba44573ab92dc58a4242f1ee734c5d, reversing changes made to c63af942e5baf7849a94fa99da8494bcba28e3f8. | ||||
| * | | | | | | | Merge branch 'use-send-url-for-incompatible-runners' into 'master' | Grzegorz Bizon | 2018-02-28 | 2 | -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 McGivern | 2018-02-28 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move uploads to object storage Closes #4163 See merge request gitlab-org/gitlab-ee!3867 | ||||
| * | | | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into ↵ | Kamil Trzciński | 2018-02-28 | 17 | -117/+346 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| * \ \ \ \ \ \ \ | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into ↵ | Kamil Trzciński | 2018-02-28 | 34 | -208/+419 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| * \ \ \ \ \ \ \ \ | Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into ↵ | Kamil Trzciński | 2018-02-28 | 19 | -189/+324 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| * \ \ \ \ \ \ \ \ \ | Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into ↵ | Kamil Trzciński | 2018-02-28 | 25 | -130/+270 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| * \ \ \ \ \ \ \ \ \ \ | Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into ↵ | Kamil Trzciński | 2018-02-28 | 64 | -316/+888 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport | ||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into ↵ | Kamil Trzciński | 2018-02-28 | 45 | -381/+940 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | object-storage-ee-to-ce-backport |