root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
47,540 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

1422 Commits

Author SHA1 Message Date
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
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 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
Sean McGivern de37dcee90 Merge branch 'siemens/gitlab-ce-feature/openid-connect' 2017-03-07 16:16:08 +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
Markus Koller 93daeee164 Don't allow blocked users to authenticate through other means 
Gitlab::Auth.find_with_user_password is currently used in these places:

- resource_owner_from_credentials in config/initializers/doorkeeper.rb,
  which is used for the OAuth Resource Owner Password Credentials flow

- the /session API call in lib/api/session.rb, which is used to reveal
  the user's current authentication_token

In both cases users should only be authenticated if they're in the
active state.
 2017-03-07 15:00:29 +01: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
Tomasz Maczukin 0905fe4d7a
Change artifacts and cache fields to arrays 2017-03-06 20:54:30 +01:00
Tiago Botelho 005749a616 apply codestyle and implementation changes to the respective feature code 2017-03-06 19:18:26 +00: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 2ff139ddee Make Warden set_user hook validate user ip uniquness 
+ rename shared context
 2017-03-06 15:41:25 +01:00
Pawel Chojnacki 9cc0ff8f46 Cleanup common code in Unique Ips tests 2017-03-06 15:41:25 +01:00
Pawel Chojnacki b1da4f7de3 Cleanup RSpec 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
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 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
Adam Niedzielski 5753acfabc Move schema definitions for our public API to a separate directory 2017-03-06 14:17:07 +01:00
Kamil Trzcinski d5f7060400
Rename `/take` to `/take_ownership`, expose `owner` in `v3`. 2017-03-06 12:00:15 +01:00
Tomasz Maczukin 440ef7802d
Fix rubocop offenses 2017-03-06 11:51:09 +01:00
Kamil Trzcinski 01f99bd269
Update after review 2017-03-06 11:49:44 +01:00
Kamil Trzcinski 140b51ce98
Introduce tests for pipeline triggers 2017-03-05 20:58:08 +01:00
Kamil Trzcinski c33f09d254
Update triggers API 2017-03-05 18:49:30 +01:00
Robert Speicher e19bcc7b6d Merge branch '26847-api-pipelines-use-basic' into 'master' 
Expose pipelines as PipelineBasic `api/v4/projects/:id/pipelines`

Closes #26847

See merge request !8875
 2017-03-03 20:31:25 +00:00
Alejandro Rodríguez 0b9d56f960 Update storage settings to allow extra values per shard 
This will be necessary when adding gitaly settings. This version
doesn't make any functional changes, but allows us to include this
breaking change in 9.0 and add the needed extra settings in the future
with backwards compatibility
 2017-03-03 12:13:30 -03:00
Toon Claes 6357635686 Rename query parameter to `membership` 
The query parameter `membership` should be more self-explaining.
 2017-03-03 13:42:39 +01:00
Oswaldo Ferreira 06e96907ee Add filter param for authorized projects for current_user for V4 2017-03-03 12:02:41 +01:00
Toon Claes 59e7d04bc7 Expose pipelines as PipelineBasic `projects/:id/pipelines` 
The `projects/:id/pipelines` exposed a lot of extra details
that are superfluous and it was taking extra resources to fetch them.

To get more details about a pipeline, use
`projects/:id/pipelines/:pipeline_id`.
 2017-03-03 09:52:04 +01:00
Sean McGivern b18646040c Merge branch '27532_api_changes' into 'master' 
Use iids as filter parameter

Closes #27532

See merge request !9096
 2017-03-03 06:32:58 +00:00
Robert Speicher 9398f64563 Merge branch 'dm-fix-api-create-file-on-empty-repo' into 'master' 
Fix creating a file in an empty repo using the API

Closes #28626

See merge request !9632
 2017-03-02 23:14:02 +00:00
Douwe Maan 8ec8b2da66 Merge branch '27501-api-use-visibility-everywhere' into 'master' 
API: Use `visibility` as string parameter everywhere

Closes #27501

See merge request !9337
 2017-03-02 17:10:25 +00:00