fd79df64c5
Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'
...
Resolve "Squash and merge in GitLab Core (CE)"
Closes #34591
See merge request gitlab-org/gitlab-ce!18956
2018-05-30 07:38:31 +00:00
4cff66a6c4
Add 'squash and rebase' feature to CE
2018-05-29 20:51:43 +11:00
2b8eb7273e
Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set when retrieved from cache
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-05-29 10:38:59 +02:00
4131a49bb7
Expose artifacts_expire_at field for job entity in api
...
https://gitlab.com/gitlab-org/gitlab-ce/issues/45798
2018-05-26 10:59:42 +05:00
10237d458d
Expose readme url in Project API
2018-05-22 10:53:37 +00:00
f3440e5963
Expose runner ip address to runners API
...
Signed-off-by: Lars Greiss <l.greiss@mediacologne.de>
2018-05-08 00:40:03 +02:00
bddbcaefc2
Backports every CE related change from ee-44542 to CE
2018-05-04 17:33:26 +02:00
04d07cc5b4
Merge branch 'feature/runner-per-group' into 'master'
...
Shared CI runners for groups
See merge request gitlab-org/gitlab-ce!9646
2018-05-04 09:44:05 +00:00
e50bed7eff
Fix lambda arguments in Grape entities
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-05-03 18:16:27 +02:00
d39b3d4b8d
Merge branch 'master' into feature/runner-per-group
2018-05-03 09:54:12 +02:00
7a76caa5a8
Merge request and commit discussions API
2018-05-01 12:39:44 +00:00
b55c3a7bc4
support group runners in existing API endpoints
2018-04-23 09:21:43 +02:00
3a4086e22f
Expose the target commit ID through the tag API
...
This is useful for annotated tags, where the deferenced target is not the same as the tag object. At the moment there is no way to differentiate the two through the tag API.
This change adds a "target" property and leaves the existing "commit" property alone so that existing behaviour is not altered.
2018-04-08 20:59:03 +01: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
f6d58310fc
Resolve "Allow the configuration of a project's merge method via the API"
2018-04-04 09:56:38 +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
6ecde0076a
Remove Ci::Build#timeout
2018-03-28 14:00:05 +02:00
f5e602ee0f
Rename maximum_job_timeout to maximum_timeout
2018-03-28 13:58:15 +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
8b2ec23fef
Set `allow_maintainer_to_push` using the API
2018-03-07 16:59:17 +01:00
1da5a103ac
Merge branch 'jprovazn-api' into 'master'
...
Add discussion API
See merge request gitlab-org/gitlab-ce!17510
2018-03-07 13:37:50 +00:00
dcdfa04b32
Add discussion API
...
* adds basic discussions API for issues and snippets
* reorganizes notes specs (so same tests can be used for all noteable types - issues, MRs, snippets)
2018-03-07 12:27:50 +01:00
39b393fa72
Merge branch '29130-api-project-export' into 'master'
...
Resolve "API endpoint for exporting project"
Closes #29130
See merge request gitlab-org/gitlab-ce!15860
2018-03-06 15:24:14 +00:00
3e71955bef
review: prefix un-used argument with underscore
2018-03-05 13:55:20 -06:00
8fe880dc06
Projects and groups badges API
2018-03-05 17:51:40 +00:00
bb89412ffb
expose metrics in merge request api
2018-03-02 16:48:55 +00:00
20844326f3
align "confidential issues events" implementation with "issues events" one
2018-03-01 10:51:56 +01:00
a4308c53e5
Add project export API entities
2018-02-28 20:47:36 -06:00
f211e47eb2
closed by field added
2018-02-28 19:25:24 +05:30
ee68bd9771
Add DNS verification to Pages custom domains
2018-02-23 12:22:29 +00:00
feab47e082
Merge branch '41899-api-endpoint-for-importing-a-project-export' into 'master'
...
Resolve "API endpoint for importing a project export"
Closes #41899
See merge request gitlab-org/gitlab-ce!17025
2018-02-16 14:05:51 +00:00
6085656bff
Merge branch 'feature/include-custom-attributes-in-api' into 'master'
...
Allow including custom attributes in API responses
See merge request gitlab-org/gitlab-ce!16526
2018-02-14 10:40:59 +00:00
5e829934f9
Merge branch '42934-search-api-fix' into 'master'
...
Add information about projects when searching in wiki_blobs, blobs, commits scopes
Closes #42934
See merge request gitlab-org/gitlab-ce!17095
2018-02-14 10:15:49 +00:00
a724f7e35f
Refactor commits/refs API to use hash and add pagination headers
2018-02-14 10:16:34 +01:00
b0b4ae1875
API - Include project in commits&blobs search results
2018-02-14 09:00:26 +01:00
4a0d56daac
fix entity
2018-02-13 15:25:48 +01:00
848f49801d
add entity and update spec
2018-02-13 15:25:47 +01:00
922d156a5e
Separate branch and tag names
2018-02-09 17:46:41 +01:00
4cefb568d9
Incorporate feedback
2018-02-09 14:59:47 +01:00
cea2a8f741
Basic ref fetching for commits
2018-02-09 13:25:02 +01:00
b7cd99c376
Allow including custom attributes in API responses
2018-02-08 13:30:34 +01:00
7381944565
Support search in API
2018-02-06 16:02:02 +01:00
46a6edc731
Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints
...
We can simplify the code quite a bit and improve performance by using
grape-entity merge fields:
https://github.com/ruby-grape/grape-entity/tree/v0.6.0#merge-fields
Relates to #42030
2018-01-30 21:46:09 -08:00
395e500f01
Remove tap and use simplified method call
2018-01-29 16:29:25 -02:00
2944896466
Return more consistent values for merge_status on MR API
2018-01-28 18:50:43 -02:00
1db2f22b15
Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'"
...
This reverts merge request !16626
2018-01-25 11:12:14 +00:00
9f5390d81d
Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'
...
Return more consistent values for merge_status on V4 MR APIs
Closes #20639
See merge request gitlab-org/gitlab-ce!16626
2018-01-24 15:09:16 +00:00
45b62dfd32
Make the exposing of the Application secret more explicit
...
To make it more clear to developers that the entity exposes the
application secret, define a separate entity that only should be used
when the secret is needed (probably only on creation).
2018-01-24 09:44:07 +01:00
81bbcfacb0
Add application create API
2018-01-24 09:42:04 +01:00
Phil Hughes
blackst0ne
Rémy Coutable
Semyon Pupkov
Imre Farkas
Lars Greiss
Tiago Botelho
Kamil Trzciński
Dylan Griffith
Jan Provaznik
Alexis Reigel
Andrew Beresford
Douwe Maan
Jan
Sean McGivern
Tomasz Maczukin
Bob Van Landuyt
Travis Miller
Francisco Javier López
haseeb
Jean-Baptiste Guerraz
haseeb
Nick Thomas
Robert Schilling
Jarka Kadlecová
James Lopez
Markus Koller
Stan Hu
Oswaldo Ferreira
Toon Claes
Nicolas MERELLI