summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
Commit message (Collapse)AuthorAgeFilesLines
* Only preload member records for the relevant projects/groups/user in ↵dm-api-projects-members-preloadDouwe Maan2018-05-301-9/+20
| | | | projects API
* Merge branch 'blackst0ne-squash-and-merge-in-gitlab-core-ce' into 'master'Phil Hughes2018-05-301-0/+2
|\ | | | | | | | | | | | | Resolve "Squash and merge in GitLab Core (CE)" Closes #34591 See merge request gitlab-org/gitlab-ce!18956
| * Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-291-0/+2
| |
* | Ensure ApplicationSetting#performance_bar_allowed_group_id is properly set ↵Rémy Coutable2018-05-291-2/+10
| | | | | | | | | | | | when retrieved from cache Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Expose artifacts_expire_at field for job entity in apiSemyon Pupkov2018-05-261-0/+1
|/ | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/45798
* Expose readme url in Project APIImre Farkas2018-05-221-1/+1
|
* Expose runner ip address to runners APILars Greiss2018-05-081-0/+1
| | | | Signed-off-by: Lars Greiss <l.greiss@mediacologne.de>
* Backports every CE related change from ee-44542 to CETiago Botelho2018-05-041-0/+1
|
* Merge branch 'feature/runner-per-group' into 'master'Kamil Trzciński2018-05-041-3/+15
|\ | | | | | | | | Shared CI runners for groups See merge request gitlab-org/gitlab-ce!9646
| * Merge branch 'master' into feature/runner-per-groupDylan Griffith2018-05-031-0/+19
| |\
| * | support group runners in existing API endpointsAlexis Reigel2018-04-231-3/+15
| | |
* | | Fix lambda arguments in Grape entitiesRémy Coutable2018-05-031-2/+2
| |/ |/| | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge request and commit discussions APIJan Provaznik2018-05-011-0/+19
|/
* Expose the target commit ID through the tag APIAndrew Beresford2018-04-081-1/+1
| | | | | | 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.
* Merge branch 'jej/mattermost-notification-confidentiality-10-6' into ↵Douwe Maan2018-04-051-2/+2
| | | | | | | | | | '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
* Resolve "Allow the configuration of a project's merge method via the API"Jan2018-04-041-0/+1
|
* 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 Ci::Build#timeoutTomasz Maczukin2018-03-281-1/+1
| |
* | Rename maximum_job_timeout to maximum_timeoutTomasz Maczukin2018-03-281-1/+1
| |
* | Rename job_upper_timeout to maximum_job_timeoutTomasz Maczukin2018-03-281-1/+1
| |
* | Add support for job_upper_timeout in APITomasz Maczukin2018-03-281-0/+1
| |
* | Set `allow_maintainer_to_push` using the APIBob Van Landuyt2018-03-071-0/+1
| |
* | Merge branch 'jprovazn-api' into 'master'Sean McGivern2018-03-071-0/+7
|\ \ | | | | | | | | | | | | Add discussion API See merge request gitlab-org/gitlab-ce!17510
| * | Add discussion APIjprovazn-apiJan Provaznik2018-03-071-0/+7
| | | | | | | | | | | | | | | * 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 '29130-api-project-export' into 'master'Sean McGivern2018-03-061-0/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |
| * | | Add project export API entitiesTravis Miller2018-02-281-0/+15
| | |/ | |/|
* | | Projects and groups badges APIFrancisco Javier López2018-03-051-0/+18
| |/ |/|
* | expose metrics in merge request apihaseeb2018-03-021-4/+40
| |
* | align "confidential issues events" implementation with "issues events" oneJean-Baptiste Guerraz2018-03-011-1/+1
|/
* Add DNS verification to Pages custom domainsNick Thomas2018-02-231-0/+8
|
* Merge branch '41899-api-endpoint-for-importing-a-project-export' into 'master'Sean McGivern2018-02-161-0/+7
|\ | | | | | | | | | | | | Resolve "API endpoint for importing a project export" Closes #41899 See merge request gitlab-org/gitlab-ce!17025
| * fix entityJames Lopez2018-02-131-1/+3
| |
| * add entity and update specJames Lopez2018-02-131-0/+5
| |
* | Merge branch 'feature/include-custom-attributes-in-api' into 'master'Douwe Maan2018-02-141-0/+5
|\ \ | | | | | | | | | | | | Allow including custom attributes in API responses See merge request gitlab-org/gitlab-ce!16526
| * | Allow including custom attributes in API responsesMarkus Koller2018-02-081-0/+5
| |/
* | Merge branch '42934-search-api-fix' into 'master'Sean McGivern2018-02-141-0/+2
|\ \ | | | | | | | | | | | | | | | | | | Add information about projects when searching in wiki_blobs, blobs, commits scopes Closes #42934 See merge request gitlab-org/gitlab-ce!17095
| * | API - Include project in commits&blobs search resultsJarka Kadlecová2018-02-141-0/+2
| |/
* | Refactor commits/refs API to use hash and add pagination headersRobert Schilling2018-02-141-7/+1
| |
* | Separate branch and tag namesRobert Schilling2018-02-091-2/+6
| |
* | Incorporate feedbackRobert Schilling2018-02-091-7/+3
| |
* | Basic ref fetching for commitsRobert Schilling2018-02-091-3/+13
|/
* Support search in APIJarka Kadlecová2018-02-061-10/+15
|
* Remove N+1 queries with /projects/:project_id/{access_requests,members} API ↵sh-fix-project-members-api-perfStan Hu2018-01-301-14/+7
| | | | | | | | | | | 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
* Remove tap and use simplified method callOswaldo Ferreira2018-01-291-1/+2
|
* Return more consistent values for merge_status on MR APIosw-consistent-values-on-api-merge-statusOswaldo Ferreira2018-01-281-1/+8
|
* Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'"Douwe Maan2018-01-251-10/+1
| | | This reverts merge request !16626
* Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'Douwe Maan2018-01-241-1/+10
|\ | | | | | | | | | | | | Return more consistent values for merge_status on V4 MR APIs Closes #20639 See merge request gitlab-org/gitlab-ce!16626
| * Return more consistent values for merge_status on MR APIOswaldo Ferreira2018-01-231-1/+10
| |