Commit Graph

1866 Commits

Author SHA1 Message Date
Douwe Maan cc4ca1f3fe Merge branch '25515-delegate-single-discussion-to-new-issue' into 'master'
Create a new issue for a single discussion

See merge request !8266
2017-03-13 18:25:25 +00:00
Bob Van Landuyt 92f8277390 Make API v3 work with the new param name 2017-03-13 08:27:52 +01:00
Bob Van Landuyt ea70a0d674 Rename variable
merge_request_for_resolving_discussions ->
merge_request_to_resolve_discussions_of
2017-03-13 08:27:52 +01:00
Bob Van Landuyt 40be92e74c Make API v3 compatible with the changes in `Issues::CreateService` 2017-03-13 08:27:51 +01:00
Bob Van Landuyt f86928953d Always require MR-iid for resolving discussions
And deduplicate the finding of MR's & discussions. Now the searching
is done in the service, istead of the controller & the API.
2017-03-13 08:27:51 +01:00
Bob Van Landuyt 0267b83898 Delegate a single discussion to a new issue
Delegate a discussion in a merge request into a new issue.
The discussion wil be marked as resolved and a system note will be
added linking to the newly created issue.
2017-03-13 08:27:51 +01:00
http://jneen.net/ 0ea04cc5bf use the policy stack to protect logins 2017-03-09 11:49:52 -08:00
http://jneen.net/ 846e581732 use a magic default :global symbol instead of nil
to make sure we mean the global permissions
2017-03-09 11:49:52 -08:00
George Andrinopoulos dd30946999 Order milestone issues by position ascending in api 2017-03-09 18:43:07 +00:00
Douwe Maan 04665e938c Merge branch 'issue_16834'
# Conflicts:
#	doc/api/v3_to_v4.md
2017-03-07 22:00:23 -06:00
Douwe Maan ff9267a707 Merge branch '1381-present-commits-pagination-headers-correctly' into 'master'
GET "projects/:id/repository/commits" endpoint improvements

Closes #1381 and #20207

See merge request !9679
2017-03-08 03:05:24 +00:00
Oswaldo Ferreira d13451cd49 Returns correct header data for commits endpoint 2017-03-07 22:56:31 -03:00
George Andrinopoulos c46f933bb7 Fix pagination headers for repository commits api endpoint 2017-03-07 22:56:31 -03:00
Jordan Ryan Reuter 473cab818a Manually set total_count when paginating commits
`Kaminari.paginate_array` takes some options, most relevant of which is
a `total_count` parameter. Using the `commit_count` for `total_count`
lets us correctly treat the return of `Repository#commits` as a subset
of all the commits we may wish to list.

Addition of a new `Repository#commit_count_for_ref` method was
necessarry to allow the user to start from an arbitrary ref.

Ref #1381
2017-03-07 22:56:30 -03:00
Felipe Artur a61bb7cda3 Remove unecessary endpoint from repository, add compatibility endpoints for v3 and several improvements 2017-03-07 22:20:38 -03:00
Felipe Artur 9053d78e74 Update API endpoints for raw files 2017-03-07 21:15:47 -03:00
Toon Claes ae9218a7fd Remove user_can_download_artifacts
It was actually not used anywhere.
2017-03-07 23:45:32 +01:00
Toon Claes 901fbda67c Make it possible to query scope as scope[]=
Since issues also accepts the query parameter iids[]=, also make it
possible query scope like that.
2017-03-07 23:45:32 +01:00
Toon Claes f372400673 Add GET /projects/:id/pipelines/:pipeline_id/jobs endpoint
Add endpoint to get the jobs scoped to a pipeline.
2017-03-07 23:45:32 +01:00
Kamil Trzciński 55f2a5debc Added Prometheus Service and Prometheus graphs 2017-03-07 16:57:42 +00:00
Sean McGivern a5db7f5425 Merge branch '28447-hybrid-repository-storages' into 'master'
Update storage settings to allow extra values per shard

See merge request !9597
2017-03-07 16:55:03 +00:00
Douwe Maan 6a52cda31d Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonation_token' 2017-03-07 09:29:55 -06:00
Kamil Trzciński fb4a486605 Merge branch 'feature/runner-jobs-v4-api' into 'master'
Feature/runner jobs v4 api

Closes #28513

See merge request !9273
2017-03-07 13:53:26 +00:00
Tomasz Maczukin 32b09b8847
Add minor refactoring 2017-03-07 12:30:34 +01:00
Timothy Andrew 6384bf7a88
Implement review comments from @dbalexandre
- Typo in docs
- Newline between test/expectation in `api/issues_spec`
- Use `find_by` instead of `reference_by` in the structure defining awardables
2017-03-07 13:56:00 +05:30
Timothy Andrew 519bac658a
Fix time tracking endpoints for API v4
- Use issue/merge_request IID instead of ID
- Duplicate the original `TimeTrackingEndpoints` concern (+ specs) for V3, since
  this is a breaking change.
2017-03-07 13:56:00 +05:30
Timothy Andrew 9ccd8b8755
Migrate the Todos API to use `issuable_iid`
- Instead of `issuable_id`
2017-03-07 13:55:59 +05:30
Timothy Andrew 70584e6925
Migrate the AwardEmoji API to use `merge_request_iid` and `issue_iid`
- Instead of `merge_request_id` and `issue_id`
- The API also deals with `snippet_id`, which remains unchanged (since snippets
  don't have `iid`s
- Duplicate the original `AwardEmoji` API (and spec) for use with the V3
  API, since this is a breaking change.
2017-03-07 13:55:59 +05:30
Timothy Andrew 402e0a2dd7
Migrate the MergeRequestDiffs API to use `merge_request_iid`
- Instead of `merge_request_id`
- Duplicate the original `MergeRequestDiffs` API (and spec) for use with the V3
  API, since this is a breaking change.
2017-03-07 13:55:59 +05:30
Timothy Andrew 719327112c
API routes referencing a specific merge request should use the MR `iid`
- As opposed to the `id` that was previously being used.
- This brings the API routes closer to the web interface's routes.
- This is specific to API v4.
2017-03-07 13:06:42 +05:30
Timothy Andrew dd99622347
API routes referencing a specific issue should use the issue `iid`
- As opposed to the issue `id` that was previously being used.
- This brings the API routes closer to the web interface's routes.
- This is specific to API v4.
2017-03-07 13:06:42 +05:30
Rémy Coutable e1cc0fd564 Merge branch '28598-narrow-environment-payload-by-using-basic-project' into 'master'
Simplify project payload exposed on Environment endpoints in V4

Closes #28598

See merge request !9675
2017-03-07 00:40:35 +00:00
Tiago Botelho 005749a616 apply codestyle and implementation changes to the respective feature code 2017-03-06 19:18:26 +00:00
Robert Speicher 2f040916a1 Move `api/v3/deployments` to the correct namespace 2017-03-06 12:21:04 -05:00
Oswaldo Ferreira fa0c0bb006 Narrow environment payload by using basic project details resource 2017-03-06 14:00:38 -03:00
Kamil Trzciński b63c41e12e Merge branch 'zj-builds-to-jobs-api' into 'master'
Rename builds to jobs in the API

Closes #28515

See merge request !9463
2017-03-06 16:36:16 +00:00
Pawel Chojnacki 9cc0ff8f46 Cleanup common code in Unique Ips tests 2017-03-06 15:41:25 +01:00
Pawel Chojnacki 8993801f0c Test various login scenarios if the limit gets enforced 2017-03-06 15:41:25 +01:00
Z.J. van de Weg 75123fa9f7 Incorporate review, drop old endpoint
The endpoint dropped, get ':id/repository/commits/:sha/jobs', should be
replace by a new endpoint.
2017-03-06 14:34:47 +01:00
Z.J. van de Weg 194223476b Rename build to job in the docs 2017-03-06 14:34:07 +01:00
Z.J. van de Weg e25bb81be2 Add changelog entry
[ci skip]
2017-03-06 14:34:07 +01:00
Toon Claes 9e942b5972 Fix all tests
This commit was about 6 commits before squashing, with the main goal to
make all tests green. Now, after pushing this commit we'll see what the
CI has to say about that.
2017-03-06 14:34:07 +01:00
Z.J. van de Weg f44ab8e8ec Pick API files from 8.16.6 2017-03-06 14:34:07 +01:00
Z.J. van de Weg 0fb0227738 Keep entities the same for API v3 2017-03-06 14:34:07 +01:00
Z.J. van de Weg b5b93f80e5 Update entities, rename from builds to jobs
This commit only renames the commits, the cascading effects will be
dealt with later.
2017-03-06 14:34:07 +01:00
Z.J. van de Weg 111748ea89 Rename Builds to Jobs in the API
Fixes gitlab-org/gitlab-ce#28515

[ci skip]
2017-03-06 14:34:07 +01:00
Adam Niedzielski c727d4328f Remove "subscribed" field from API responses returning list of issues or merge requests 2017-03-06 14:17:07 +01:00
Kamil Trzcinski 20feaa9eff
Fix UserBasic 2017-03-06 12:27:55 +01:00
Kamil Trzcinski d5f7060400
Rename `/take` to `/take_ownership`, expose `owner` in `v3`. 2017-03-06 12:00:15 +01:00
Kamil Trzcinski b565ee4912
Update documentation and expose ID 2017-03-05 21:18:00 +01:00