home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
25,479 Commits 48 Branches 340 Tags
09cd4351fa17ffcae3b5ce960e562a7ced6facfe
Commit Graph
583 Commits
Author SHA1 Message Date
Douglas Barbosa Alexandre e4f1c001e6 Restrict access to confidential issues through API 2016-03-17 20:55:59 -03:00
Zeger-Jan van de Weg 51300d9b2a API support for setting External flag on existing users 2016-03-17 09:36:00 +01:00
Zeger-Jan van de Weg 88f8d3a4d6 Merge branch 'master' into 4009-external-users 2016-03-14 20:08:02 +01:00
Dmitriy Zaporozhets d324bf8434 Merge branch 'share-project-ce' into 'master' 
Bring from EE: Share Project with Group

- [x] Models and migrations
- [x] Logic, UI
- [x] Tests
- [x] Documentation
- [x] Share with group lock
- [x] Api feature
- [x] Api docs
- [x] Api tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For #12831 

cc @DouweM @rspeicher @vsizov

See merge request !3186
 2016-03-14 16:38:52 +00:00
Zeger-Jan van de Weg 42fcd3881f External Users 
The user has the rights of a public user execpt it can never create a project,
 group, or team. Also it cant view internal projects.
 2016-03-13 19:08:04 +01:00
Dmitriy Zaporozhets e8b3b92dde Bring share project with group API from EE 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-03-13 11:52:43 +01:00
Robert Speicher befa7a9c17 Don't remove ProjectSnippet#expires_at from API 
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3103

This partially reverts commit 836d593033.
 2016-03-09 16:56:42 -05:00
Robert Speicher fe9a445faa Merge branch 'evuez/gitlab-ce-add-info-user-api' into 'master' 
Expose User#last_sign_in_at and User#confirmed_at for admins

Closes #840

See merge request !3090
 2016-03-08 17:30:10 +00:00
Robert Speicher de944c914b Add traits for each access_level to ProjectMember factory 2016-03-06 16:53:22 -05:00
evuezandRémy Coutable b0d24ab1b5 Add fields to GET /users/* API endpoints for admins 
Added fields are last_sign_in_at and confirmed_at.
They are available for GET /users/ and GET /users/:id for admins.

Closes #840
 2016-03-04 11:59:43 +01:00
Douwe Maan 9b3c1a8c4f Merge branch 'fix/commit-status-api-improvement' into 'master' 
Return empty array when commit has no statuses in API

This makes API endpoint for Commit Statuses return empty array instead
of 404 when commit exists, but has no statuses.

Closes #3080

See merge request !3010
 2016-03-01 16:50:23 +00:00
Grzegorz Bizon 278f4423d1 Improve commit status API specs 2016-03-01 12:33:25 +01:00
Grzegorz Bizon 433b4581ff Improve commit status API specs (refactoring) 2016-02-29 14:20:11 +01:00
Grzegorz Bizon dcc67ac1fd Return empty array when commit has no statuses in API 
This makes API endpoint for Commit Statuses return empty array instead
of 404 when commit exists, but has no statuses.

Closes #3080
 2016-02-29 13:54:33 +01:00
James Lopez 3ac202c30f fixed merge conflict and refactored specs 2016-02-29 10:59:16 +01:00
James Lopez c401e8338b updated internal.rb and spec based on MR feedback 2016-02-26 10:40:30 +01:00
James Lopez d377948931 fix for projects ending in .wiki 2016-02-24 15:54:36 +01:00
Kamil Trzcinski 73be775cd7 Fix ci_build trace trait 2016-02-19 19:31:57 +01:00
Kamil Trzcinski 55701d9c6c Fix specs 2016-02-19 18:30:43 +01:00
Kamil Trzcinski 921cfb66e6 Introduce API for serving the artifacts archive 2016-02-19 18:30:13 +01:00
Grzegorz Bizon 73c9d80bdc Record user that erased a build through API 2016-02-19 17:24:59 +01:00
Grzegorz Bizon 7d5a182624 Use POST method instead of DELETE when erasing a build 
Discussion:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3742042
 2016-02-19 17:24:59 +01:00
Grzegorz Bizon 293999cabb Fix name of build erasable, remove superfluous method from it 2016-02-19 17:24:59 +01:00
Grzegorz BizonandGrzegorz Bizon 13f92521c2 Move build eraseable API to proper API context 2016-02-19 17:24:59 +01:00
Tomasz Maczukin acfe25edc0 Refactorize ci_runner factory and let definitions in runners API spec 2016-02-19 13:18:49 +01:00
Tomasz Maczukin f8f492e589 Remove unnecessary parameters 2016-02-19 13:18:49 +01:00
Tomasz Maczukin a5540b385d Modify expectations for update runner feature 2016-02-19 13:18:48 +01:00
Tomasz Maczukin d38322b895 Change .map{...}.inject{...} to any?{...} for searching shared runners 2016-02-19 13:18:48 +01:00
Tomasz Maczukin 957c4de9b1 Reorganize let statements in spec/requests/api/runners_spec.rb 2016-02-19 13:18:48 +01:00
Tomasz Maczukin b36116f9ad Move :runner_id param to POST body when enabling specific runner in project 2016-02-19 13:18:48 +01:00
Tomasz Maczukin dc182dc50e Add some modifications to spec/requests/api/runners_spec.rb 2016-02-19 13:18:48 +01:00
Tomasz Maczukin 36e7ffea5d Fix runners filtering 2016-02-19 13:18:47 +01:00
Tomasz Maczukin 16b3368af3 Fix runners API spec 2016-02-19 13:18:47 +01:00
Tomasz Maczukin 81ced6f55b Split /runners entrypoint to /runners and /runners/all 2016-02-19 13:18:47 +01:00
Tomasz Maczukin 53f775ae6d Fix runners filtering in API 2016-02-19 13:18:46 +01:00
Tomasz Maczukin d42ced44d9 Add feature to enable/disable runner in project 2016-02-19 13:18:46 +01:00
Tomasz Maczukin 128be3c010 Add basic runners management API 
- add feature to list runners
- add feature to show runners details
- add feature to delete runner
- add feature to update runner
 2016-02-19 13:18:46 +01:00
Jacob Vosmaer a0ccb0731b Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-refactor 2016-02-17 11:30:42 +01:00
Douwe Maan 0807bd5130 Merge branch 'skakirill/gitlab-ce-api-merge-request-setup-milestone' into 'master' 
API: Allow to set or update a merge-request's milestone

_Originally opened at !2107 by @ skakirill._

- - -


See merge request !2755
 2016-02-12 08:39:18 +00:00
Rémy Coutable 973a7d040e Merge branch 'Schniz/gitlab-ce-feature/merge-request-closes-issues-in-api' into 'master' 
Add merge_requests/:merge_request_id/closes_issues

_Originally opened at !2660 by @Schniz._

- - -

Added `/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues` route in the API for getting the issues that should be closed when a merge request merged successfully

See merge request !2779
 2016-02-11 17:13:36 +00:00
Jacob Vosmaer 34a6f83d3e Fix API 2016-02-11 18:10:14 +01:00
Rémy Coutable b91d1890a8 Pass current_user to merge_request.closes_issues in API ans streamline MR API specs 2016-02-11 09:34:07 +01:00
Gal SchlezingerandRémy Coutable 78e36780be Added '/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues' route in the API 
Added some documentation for it

Added to changelog

Added curl example and an attribute table

Moved the api route definition from "lib/api/issues.rb" to "lib/api/merge_requests.rb"

Fixed the attributes and changed the documentation to be at "merge_requests.md" too

Changed generic titles to more specific titles

added an underscore

added tests. it depends on a newer version of gitlab-test project
I'm doing a  since I need to add a branch to the `gitlab-test` repo

removed the before

using 'iid' instead of 'id' in the description to reference the issues. that makes the tests pass

Removed the 'closes-issues' key from test_env. so it should pass the tests

Moved the two initializations to the describe block

Changed the changelog
 2016-02-11 09:34:07 +01:00
Robert Speicher 7ea60fbfc8 Merge remote-tracking branch 'dev/master' into 'master' 2016-02-09 12:13:58 -05:00
Rémy Coutable 2d59a0ff44 Add a spec for setting/updating a MR's milestone via the API 2016-02-09 10:06:26 +01:00
Rémy Coutable f6a666bdc2 Add an API spec for MergeRequest#merge_status and properly document this resource 2016-02-08 17:18:44 +01:00
Kamil Trzcinski 311f407651 Fix commit status tests 2016-02-06 15:01:37 +01:00
Kamil Trzcinski 6fea7c386f Merge remote-tracking branch 'origin/master' into ci-permissions 
# Conflicts:
#	app/views/projects/builds/index.html.haml
 2016-02-04 13:16:48 +01:00
Robert Speicher 8a85906a74 Merge branch 'support-akismet' into 'master' 
Support Akismet spam checking for creation of issues via API

Currently any spam detected by Akismet for non-members via API will
be logged in a separate table in the admin page.

Closes #5612

See merge request !2266
 2016-02-03 01:26:30 +00:00
Rémy Coutable 070a3079fc Add a spec for the API pagination Link header 2016-02-02 15:26:29 +01:00