f20912df03
Extend API for importing a project export with overwrite support
2018-04-06 15:23:49 +00:00
44f4a674e2
Merge branch 'jramsay-38830-tarball' into 'master'
...
Add alternative archive route
Closes #38830
See merge request gitlab-org/gitlab-ce!17225
2018-04-06 14:14:39 +00:00
fdffe54b30
Merge branch 'issue_42443' into 'master'
...
Include subgroup issues when searching for group issues using the API
Closes #42443
See merge request gitlab-org/gitlab-ce!18068
2018-04-06 08:47:26 +00:00
dd271e2460
Merge branch 'direct-upload-of-artifacts' into 'master'
...
Direct upload of artifacts
See merge request gitlab-org/gitlab-ce!18160
2018-04-05 20:59:40 +00:00
b9dfd071ed
Include subgroup issues when searching for group issues using the API
2018-04-05 17:19:52 -03:00
082bf1c6ee
Merge branch 'bvl-override-import-params' into 'master'
...
Allow passing params to import API to override project attributes
Closes gitlab-ee#4788
See merge request gitlab-org/gitlab-ce!18086
2018-04-05 15:18:49 +00:00
678620cce6
Add `direct_upload` setting for artifacts
2018-04-05 15:01:14 +02:00
52967b107b
Merge branch 'jej/mattermost-notification-confidentiality-10-6' into '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
2018-04-05 08:41:56 +02:00
0b1b9c409d
Add option to suppress archive commit sha
...
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
2018-04-04 16:56:18 -04:00
e40c0085ef
Store override params as import data on projects
...
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.
2018-04-04 19:49:48 +02:00
11a9fbe65b
Make the API project params reusable
2018-04-04 19:49:48 +02:00
ad7148d9ea
Allow assigning and filtering issuables by ancestor group labels
2018-04-04 15:40:29 +00:00
e43c01e6b8
Merge branch 'zj-feature-gate-remove-http-api' into 'master'
...
Allow feature gate removal through the API
See merge request gitlab-org/gitlab-ce!18146
2018-04-04 13:13:44 +00:00
f6d58310fc
Resolve "Allow the configuration of a project's merge method via the API"
2018-04-04 09:56:38 +00:00
caca8f34ff
Allow feature gate removal through the API
...
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.
2018-04-03 16:39:08 +02:00
61c8093b26
Store metadata checksum for artifacts
2018-04-03 20:42:51 +09:00
22b05a1ff7
Extend API for exporting a project with direct upload URL
2018-03-30 15:45:59 +00:00
7c36e8561c
Merge branch '41967_issue_api_closed_by_info' into 'master'
...
Add closed by information to issue API
See merge request gitlab-org/gitlab-ce!17042
2018-03-30 15:43:45 +00:00
b942462788
Remove support for absolute dirs from Git::Env
2018-03-30 09:19:46 +00:00
8b37ce6f7f
Merge branch 'add-per-runner-job-timeout' into 'master'
...
Add per runner job timeout
Closes #43426
See merge request gitlab-org/gitlab-ce!17221
2018-03-29 10:54:06 +00:00
869b7b31cf
Merge branch 'dm-deploy-keys-default-user' into 'master'
...
Ensure hooks run when a deploy key without a user pushes
Closes #44317
See merge request gitlab-org/gitlab-ce!18057
2018-03-29 09:30:10 +00:00
59d910f2a1
Set user when adding deploy key to project using API
2018-03-28 18:53:52 +02:00
fffa19cbb6
Merge branch 'expose-commits-mr-api' into 'master'
...
Allow merge requests related to a commit to be found via API
See merge request gitlab-org/gitlab-ce!18004
2018-03-28 14:24:05 +00:00
6ecde0076a
Remove Ci::Build#timeout
2018-03-28 14:00:05 +02:00
557c85a79f
Use raw value of maximum_timeout for Runner registration API
2018-03-28 13:58:34 +02:00
f5e602ee0f
Rename maximum_job_timeout to maximum_timeout
2018-03-28 13:58:15 +02:00
62f053e4e5
Update runner registration API
2018-03-28 13:57:41 +02:00
dbd7455583
Use _human_readable for Runner's registration API
2018-03-28 13:57:18 +02:00
d633bc8134
Rename job_upper_timeout to maximum_job_timeout
2018-03-28 13:55:46 +02:00
7b82f4bab1
Add support for job_upper_timeout in API
2018-03-28 13:55:46 +02:00
96b355dca0
Merge branch 'jej/add-protected-branch-policy' into 'master'
...
Add protected branch policy
See merge request gitlab-org/gitlab-ce!17982
2018-03-27 14:31:54 +00:00
835fe4d324
Merge branch '40781-os-to-ce' into 'master'
...
Bring Object Storage to CE
Closes #4171 , #4163 , #3370 , #2841 , and #29203
See merge request gitlab-org/gitlab-ce!17358
2018-03-27 08:20:03 +00:00
847671e06c
Allow merge requests related to a commit to be found via API
...
- Original work for the web interface here:
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13713
2018-03-26 19:34:36 +01:00
3cefa9ea6d
ProtectedBranch API omits empty declared params
2018-03-26 14:56:14 +01:00
b6a4c0181b
API uses ProtectedBranchPolicy for destroy/create
2018-03-26 10:29:53 +01:00
54baf3a362
Resolve "Forking with namespace doesn't work (API)"
2018-03-26 09:22:03 +00:00
a47565aa14
Updated grape to `1.0.2` to remove workaround
2018-03-26 01:43:43 +01:00
9c6663ea07
Merge remote-tracking branch 'origin/master' into 40781-os-to-ce
2018-03-22 09:06:10 -04:00
cf1a1e9ac1
Send Gitaly payload for git-upload-archive SSH commands
2018-03-21 10:57:06 -03:00
439c63365f
Merge branch 'issue_25542' into 'master'
...
Improve JIRA event descriptions
Closes #25542
See merge request gitlab-org/gitlab-ce!17811
2018-03-20 08:45:08 +00:00
2ee197086a
Improve JIRA event descriptions
2018-03-19 16:36:16 -03:00
2370ff85fe
Optional '/-/' delimiter for search API
...
'/-/' 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 '/-/'.
2018-03-19 20:02:15 +01:00
5248e37f27
Adds the option to override project description on export via API
...
and fixes the project description not being imported
2018-03-16 13:56:11 +00:00
3802006436
Respect the protocol in `expose_url`
...
When https is configured in the URL, also use that, and do not set it
to http.
Closes gitlab-org/gitlab-ee#5217
2018-03-12 15:34:11 +01:00
fc6587f1f2
Add proxy_download to perform proxied sending of all files
2018-03-09 09:16:06 -05:00
6466739e2e
Merge remote-tracking branch 'origin/master' into 40781-os-to-ce
2018-03-08 10:55:47 -05:00
e85f4697cc
Merge branch 'bvl-allow-maintainer-to-push' into 'master'
...
Allow maintainers to push forks of a project for branches that have open MRs
Closes #22292
See merge request gitlab-org/gitlab-ce!17395
2018-03-07 18:43:53 +00:00
9b27027619
Add documentation for allowing maintainers to push
2018-03-07 16:59:17 +01:00
8b2ec23fef
Set `allow_maintainer_to_push` using the API
2018-03-07 16:59:17 +01:00
82ea46a707
Merge branch 'gitaly-git-mandatory' into 'master'
...
Make git push mandatory
See merge request gitlab-org/gitlab-ce!17565
2018-03-07 15:57:45 +00:00
Francisco Javier López
Douwe Maan
Sean McGivern
Grzegorz Bizon
Felipe Artur
Kamil Trzciński
James Ramsay
Bob Van Landuyt
Felipe Artur
Jan
Zeger-Jan van de Weg
Shinya Maeda
Jacob Vosmaer (GitLab)
Douwe Maan
Rémy Coutable
Tomasz Maczukin
Nick Thomas
Mark Fletcher
James Edwards-Jones
Micaël Bergeron
Alejandro Rodríguez
Jan Provaznik
Tiago Botelho
Toon Claes