summaryrefslogtreecommitdiff
path: root/lib/api
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'api-mr-merge' into 'master'Dmitriy Zaporozhets2014-05-131-1/+44
|\ \ | | | | | | | | | | | | | | | | | | | | | Accept merge request API This MR adds new endpoint `PUT /projects/:id/merge_request/:merge_request_id/merge`. After this change you can merge branches using API. Fixes internal issue #1166
| * | Add some tests for merge APIDmitriy Zaporozhets2014-05-131-2/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Docs for merge apiDmitriy Zaporozhets2014-05-121-0/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Specify error codes for merge apiDmitriy Zaporozhets2014-05-121-9/+12
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Draft API method for merge MRDmitriy Zaporozhets2014-05-121-0/+39
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge pull request #6823 from milgner/api_expose_project_archived_statusDmitriy Zaporozhets2014-05-131-0/+1
|\ \ \ | |/ / |/| | Expose archive status of projects in API
| * | Expose archive status of projects in APIMarcus Ilgner2014-04-181-0/+1
| | | | | | | | | | | | | | | That way clients like Gitlab CI can decide to show or hide projects based on that information
* | | Add fix for API when branch names have periods in them. Relates to issue ↵Sean Edge2014-05-081-3/+7
| |/ |/| | | | | #6128 (https://github.com/gitlabhq/gitlabhq/issues/6128).
* | Implement GET /users/:uid/keys for admin usersTimm Friebe2014-04-181-0/+39
|/ | | | | | | | | | | | | | | | | | | | | | | | | | Complements POST operation added in gitlabhq/gitlabhq#3146 Implement DELETE /users/:uid/keys/:id for admin users Fix "Line is too long. [83/80]" Use single quotes as advised Use single quotes as advised Use single quotes as advised Fix missing space around { and } Fix typo in documentation Only catch ActiveRecord::RecordNotFound, let other exceptions propagate Raise a "404 Not found" if key to be deleted cannot be found As requested by @jvanbaarsen in https://github.com/gitlabhq/gitlabhq/pull/6781#discussion_r11735114 Remove tab Unconfigured vim on this box, grrrr./
* Merge pull request #6699 from criteo/api_get_open_merge_requestsDmitriy Zaporozhets2014-04-131-1/+11
|\ | | | | Add optional parameter to list merge requests
| * Add optional parameter to list merge requestsStuart Pook2014-04-071-1/+11
| | | | | | | | | | | | | | Add an optional parameter to list merge requests to restrict the returned merge requests to those that are "opened", "merged" or "closed". By default all merge requests are returned. Note that "all" can be given to explicitly request all merge requests.
* | Expose event and and mergerequest timestamps in API, make code more DRY.Mart Sõmermaa2014-04-101-4/+5
|/
* Merge pull request #6190 from ↵Dmitriy Zaporozhets2014-04-031-1/+3
|\ | | | | | | | | Popl7/add-better-branch-protection-against-history-rewrite-and-deletion protect protected branched to force updates
| * first setup to protect protected branched to force updatesSteven Thonus2014-03-251-1/+3
| |
* | Use MergeRequest services in API and controllersDmitriy Zaporozhets2014-04-021-41/+17
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Move update issue code to separate serviceDmitriy Zaporozhets2014-04-021-10/+10
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Move code for issue creation to service.Dmitriy Zaporozhets2014-04-021-11/+9
| | | | | | | | | | | | | | | | | | The goal of suych refactoring is to get rid of observers. Its much easier to test and code when object creation and all other related actions done in one class instead of splited across observers, callbacks etc. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Create branch via APIDmitriy Zaporozhets2014-04-012-0/+19
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Move branches api to separate classDmitriy Zaporozhets2014-03-314-70/+72
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge pull request #5469 from NARKOZ/api-pagination-headersDmitriy Zaporozhets2014-03-311-2/+18
|\ \ | | | | | | add 'Link' header for API response
| * | add 'Link' header for API responseNihad Abbasov2013-10-291-2/+18
| | |
* | | Make the repository downloads path configurableJacob Vosmaer2014-03-311-1/+1
| | |
* | | Merge pull request #6569 from criteo/api_merge_request_commentsDmitriy Zaporozhets2014-03-261-0/+16
|\ \ \ | |_|/ |/| | Add method to get the comments on a merge request
| * | Add method to get the comments on a merge requestStuart Pook2014-03-191-0/+16
| | | | | | | | | | | | | | | Add method to get the comments for a merge request and document that you can change the status of a merge request.
* | | changed doc comment for get labels of a projectÁbner Silva de Oliveira2014-03-231-2/+4
| | |
* | | added api method to return labels of a given projectÁbner Silva de Oliveira2014-03-212-0/+13
| | |
* | | Use GitAccess in internal apiDmitriy Zaporozhets2014-03-201-41/+19
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix testsDmitriy Zaporozhets2014-03-171-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add tests for API project permissions infoDmitriy Zaporozhets2014-03-171-1/+3
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Remove old entitiesDmitriy Zaporozhets2014-03-171-12/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Add current user permissions info to /api/projects/:id.jsonDmitriy Zaporozhets2014-03-172-2/+24
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Move project members api to separate fileDmitriy Zaporozhets2014-03-174-114/+115
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'issue-110' of https://gitlab.com/gmessner/gitlab-ce into ↵Dmitriy Zaporozhets2014-03-161-2/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | gmessner/gitlab-ce-issue-110 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * | Added description parameter support to Create and Update MR API endpoints ↵Greg Messner2014-03-031-2/+4
| | | | | | | | | | | | (issue-110).
* | | Change project lookup order for apiDmitriy Zaporozhets2014-03-141-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge pull request #6360 from jvanbaarsen/fix-6328-expose-usernameDmitriy Zaporozhets2014-03-131-1/+1
|\ \ \ | | | | | | | | Also expose username for the /discover endpoint
| * | | Also expose username for the /discover endpointJeroen van Baarsen2014-02-201-1/+1
| |/ / | | | | | | | | | Fixes #6328
* | | Add ldap check in application_controller and internal apiDmitriy Zaporozhets2014-03-101-1/+7
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Refactor MR code reloadDmitriy Zaporozhets2014-02-181-2/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'feature/api_fle_encoded' into 'master'Dmitriy Zaporozhets2014-02-184-45/+117
|\ \ | | | | | | | | | | | | | | | Complete api files CRUD Adds ability to read file from repository with content encoded with Base64.
| * | Extract commits API to separate fileDmitriy Zaporozhets2014-02-183-44/+65
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Complete api files CRUDDmitriy Zaporozhets2014-02-181-1/+52
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fixed bug with json files content being escaped in apiDmitriy Zaporozhets2014-02-182-3/+3
|/ / | | | | | | | | | | | | After update to recent grape env['api.format'] does not work any more. Use content_type for rendering raw json files content Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge pull request #6189 from jcockhren/api_ldap_check_for_userDmitriy Zaporozhets2014-02-171-1/+3
|\ \ | | | | | | the existence of former ldap users doesn't imply LDAP is enabled.
| * | In the case when a user can and has authenticated with ldap, howeverJurnell Cockhren2014-01-281-1/+3
| | | | | | | | | | | | | | | ldap is disabled in the gitlab config, this fixes the API still calling the ldap backend.
* | | project_user selectbox with ajax autocompleteDmitriy Zaporozhets2014-02-131-1/+13
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Show avatars in ajax user selectboxDmitriy Zaporozhets2014-02-131-0/+6
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Improve code according to new gitlab_gitDmitriy Zaporozhets2014-02-042-11/+23
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'improve/mr_diff'Dmitriy Zaporozhets2014-01-231-1/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/project_fork.rb features/steps/project/project_forked_merge_requests.rb features/steps/project/project_issue_tracker.rb features/steps/project/project_markdown_render.rb features/steps/shared/project.rb
| * | Always create merge_request_diff if MR createdDmitriy Zaporozhets2014-01-221-1/+0
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status