Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Restrict access to confidential issues through API | Douglas Barbosa Alexandre | 2016-03-17 | 1 | -2/+110 |
| | |||||
* | API support for setting External flag on existing users | Zeger-Jan van de Weg | 2016-03-17 | 1 | -0/+7 |
| | |||||
* | Merge branch 'master' into 4009-external-users | Zeger-Jan van de Weg | 2016-03-14 | 2 | -0/+54 |
|\ | |||||
| * | Merge branch 'share-project-ce' into 'master' | Dmitriy Zaporozhets | 2016-03-14 | 1 | -0/+36 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Bring share project with group API from EEshare-project-ce | Dmitriy Zaporozhets | 2016-03-13 | 1 | -0/+36 |
| | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Don't remove `ProjectSnippet#expires_at` from APIrs-snippet-expires-api | Robert Speicher | 2016-03-09 | 1 | -0/+18 |
| |/ | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3103 This partially reverts commit 836d5930332797192094ce4a3c8083e96f7e8c53. | ||||
* | | External Users | Zeger-Jan van de Weg | 2016-03-13 | 1 | -0/+20 |
|/ | | | | | 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. | ||||
* | Merge branch 'evuez/gitlab-ce-add-info-user-api' into 'master' | Robert Speicher | 2016-03-08 | 1 | -0/+2 |
|\ | | | | | | | | | | | | | Expose User#last_sign_in_at and User#confirmed_at for admins Closes #840 See merge request !3090 | ||||
| * | Add fields to GET /users/* API endpoints for adminsevuez/gitlab-ce-add-info-user-api | evuez | 2016-03-04 | 1 | -0/+2 |
| | | | | | | | | | | | | | | Added fields are last_sign_in_at and confirmed_at. They are available for GET /users/ and GET /users/:id for admins. Closes #840 | ||||
* | | Add traits for each access_level to ProjectMember factory | Robert Speicher | 2016-03-06 | 12 | -27/+27 |
|/ | |||||
* | Merge branch 'fix/commit-status-api-improvement' into 'master' | Douwe Maan | 2016-03-01 | 1 | -54/+110 |
|\ | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Improve commit status API specsfix/commit-status-api-improvement | Grzegorz Bizon | 2016-03-01 | 1 | -30/+19 |
| | | |||||
| * | Improve commit status API specs (refactoring) | Grzegorz Bizon | 2016-02-29 | 1 | -41/+76 |
| | | |||||
| * | Return empty array when commit has no statuses in API | Grzegorz Bizon | 2016-02-29 | 1 | -37/+69 |
| | | | | | | | | | | | | | | This makes API endpoint for Commit Statuses return empty array instead of 404 when commit exists, but has no statuses. Closes #3080 | ||||
* | | fixed merge conflict and refactored specs | James Lopez | 2016-02-29 | 1 | -6/+2 |
| | | |||||
* | | updated internal.rb and spec based on MR feedback | James Lopez | 2016-02-26 | 1 | -2/+8 |
| | | |||||
* | | fix for projects ending in .wiki | James Lopez | 2016-02-24 | 1 | -0/+10 |
|/ | |||||
* | Fix ci_build trace trait | Kamil Trzcinski | 2016-02-19 | 1 | -2/+2 |
| | |||||
* | Fix specs | Kamil Trzcinski | 2016-02-19 | 1 | -59/+76 |
| | |||||
* | Introduce API for serving the artifacts archive | Kamil Trzcinski | 2016-02-19 | 1 | -0/+25 |
| | |||||
* | Record user that erased a build through API | Grzegorz Bizon | 2016-02-19 | 1 | -0/+5 |
| | |||||
* | Use POST method instead of DELETE when erasing a build | Grzegorz Bizon | 2016-02-19 | 1 | -3/+3 |
| | | | | | Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3742042 | ||||
* | Fix name of build erasable, remove superfluous method from it | Grzegorz Bizon | 2016-02-19 | 1 | -2/+2 |
| | |||||
* | Move build eraseable API to proper API context | Grzegorz Bizon | 2016-02-19 | 1 | -0/+25 |
| | |||||
* | Refactorize `ci_runner` factory and `let` definitions in runners API spec | Tomasz Maczukin | 2016-02-19 | 1 | -16/+14 |
| | |||||
* | Remove unnecessary parameters | Tomasz Maczukin | 2016-02-19 | 1 | -5/+5 |
| | |||||
* | Modify expectations for update runner feature | Tomasz Maczukin | 2016-02-19 | 1 | -4/+4 |
| | |||||
* | Change `.map{...}.inject{...}` to `any?{...}` for searching shared runners | Tomasz Maczukin | 2016-02-19 | 1 | -5/+5 |
| | |||||
* | Reorganize `let` statements in spec/requests/api/runners_spec.rb | Tomasz Maczukin | 2016-02-19 | 1 | -12/+29 |
| | |||||
* | Move :runner_id param to POST body when enabling specific runner in project | Tomasz Maczukin | 2016-02-19 | 1 | -8/+14 |
| | |||||
* | Add some modifications to spec/requests/api/runners_spec.rb | Tomasz Maczukin | 2016-02-19 | 1 | -88/+112 |
| | |||||
* | Fix runners filtering | Tomasz Maczukin | 2016-02-19 | 1 | -2/+2 |
| | |||||
* | Fix runners API spec | Tomasz Maczukin | 2016-02-19 | 1 | -11/+11 |
| | |||||
* | Split `/runners` entrypoint to `/runners` and `/runners/all` | Tomasz Maczukin | 2016-02-19 | 1 | -11/+43 |
| | |||||
* | Fix runners filtering in API | Tomasz Maczukin | 2016-02-19 | 1 | -17/+24 |
| | |||||
* | Add feature to enable/disable runner in project | Tomasz Maczukin | 2016-02-19 | 1 | -0/+102 |
| | |||||
* | Add basic runners management API | Tomasz Maczukin | 2016-02-19 | 1 | -0/+278 |
| | | | | | | | - add feature to list runners - add feature to show runners details - add feature to delete runner - add feature to update runner | ||||
* | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵ | Jacob Vosmaer | 2016-02-17 | 4 | -28/+103 |
|\ | | | | | | | git-archive-refactor | ||||
| * | Merge branch 'skakirill/gitlab-ce-api-merge-request-setup-milestone' into ↵ | Douwe Maan | 2016-02-12 | 1 | -3/+12 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' API: Allow to set or update a merge-request's milestone _Originally opened at !2107 by @ skakirill._ - - - See merge request !2755 | ||||
| | * | Add a spec for setting/updating a MR's milestone via the APIskakirill/gitlab-ce-api-merge-request-setup-milestone | Rémy Coutable | 2016-02-09 | 1 | -3/+12 |
| | | | |||||
| * | | Merge branch 'Schniz/gitlab-ce-feature/merge-request-closes-issues-in-api' ↵ | Rémy Coutable | 2016-02-11 | 1 | -0/+22 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | Pass current_user to merge_request.closes_issues in API ans streamline MR ↵Schniz/gitlab-ce-feature/merge-request-closes-issues-in-api | Rémy Coutable | 2016-02-11 | 1 | -12/+8 |
| | | | | | | | | | | | | | | | | API specs | ||||
| | * | | Added '/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues' ↵ | Gal Schlezinger | 2016-02-11 | 1 | -0/+26 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | Merge remote-tracking branch 'dev/master' into 'master' | Robert Speicher | 2016-02-09 | 2 | -22/+34 |
| |\ \ | |||||
| | * | | Fix commit status tests | Kamil Trzcinski | 2016-02-06 | 1 | -18/+30 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'origin/master' into ci-permissions | Kamil Trzcinski | 2016-02-04 | 1 | -3/+34 |
| | |\ \ | | | |/ | | | | | | | | | | | | | # Conflicts: # app/views/projects/builds/index.html.haml | ||||
| | * | | Make the CI permission model simpler | Kamil Trzcinski | 2016-02-02 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR simplifies CI permission model: - read_build: allows to read a list of builds, artifacts and trace - update_build: allows to cancel and retry builds - create_build: allows to create builds from gitlab-ci.yml (not yet implemented) - admin_build: allows to manage triggers, runners and variables - read_commit_status: allows to read a list of commit statuses (including the overall of builds) - create_commit_status: allows to create a new commit status using API Remove all extra methods to manage permission. Made all controllers to use explicitly the new permissions. | ||||
| * | | | Add an API spec for MergeRequest#merge_status and properly document this ↵develop7/add-merge_status-to-merge-request-in-api | Rémy Coutable | 2016-02-08 | 1 | -0/+1 |
| | |/ | |/| | | | | | | | resource | ||||
| * | | Merge branch 'support-akismet' into 'master' | Robert Speicher | 2016-02-03 | 1 | -0/+31 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | Fix rubocop offenses | Douglas Barbosa Alexandre | 2016-02-02 | 1 | -5/+9 |
| | | | |