| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Improve consistency and duplication for Merge Request APIimprove-mr-api | Dmitriy Zaporozhets | 2016-01-28 | 1 | -170/+181 |
| | | | | | | | | * Follow REST for merge request API route * Remove repeating comments API for MR Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Get "Merge when build succeeds" to work when commits were pushed to MR ↵ | Douwe Maan | 2016-01-05 | 1 | -1/+1 |
| | | | | | target branch while builds were running | ||||
| * | Merge branch 'master' into merge-if-green | Zeger-Jan van de Weg | 2015-12-07 | 1 | -0/+16 |
| |\ | |||||
| | * | Add API endpoint to fetch merge request commits list | Dmitriy Zaporozhets | 2015-12-04 | 1 | -0/+16 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Specs for 'Merge When Build Succeeds' | Zeger-Jan van de Weg | 2015-12-02 | 1 | -14/+8 |
| | | | |||||
| * | | Refactor MergeWhenBuildSucceedsService and incorporate feedback | Zeger-Jan van de Weg | 2015-11-23 | 1 | -23/+13 |
| | | | |||||
| * | | API support, incorporated feedback | Zeger-Jan van de Weg | 2015-11-18 | 1 | -22/+46 |
| |/ | |||||
| * | Merge branch 'stanhu/gitlab-ce-fix-api-mr-comment-notifications' | Dmitriy Zaporozhets | 2015-10-15 | 1 | -2/+10 |
| |\ | |||||
| | * | Fix bug where merge request comments created by API would not trigger ↵ | Stan Hu | 2015-10-10 | 1 | -2/+10 |
| | | | | | | | | | | | | | notifications Closes https://github.com/gitlabhq/gitlabhq/issues/9715 | ||||
| * | | [ci skip] Fix wrong comment | sue445 | 2015-10-14 | 1 | -1/+1 |
| |/ | | | | | According to `attributes_for_keys` and API doc, `POST /projects/:id/merge_requests` is received `target_project_id` (NOT `target_project`) | ||||
| * | Fix broken sort in merge request API | Stan Hu | 2015-09-15 | 1 | -1/+1 |
| | | | | | Closes #2266 | ||||
| * | Revert "Merge branch 'revert-satellites' into 'master' " | Dmitriy Zaporozhets | 2015-08-11 | 1 | -1/+5 |
| | | | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c. | ||||
| * | Revert "Merge branch 'drop-satellites'" | Dmitriy Zaporozhets | 2015-08-11 | 1 | -5/+1 |
| | | | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Merge branch 'master' into drop-satellites | Dmitriy Zaporozhets | 2015-08-04 | 1 | -1/+1 |
| |\ | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | Return comments in created order in merge request API | Stan Hu | 2015-07-16 | 1 | -1/+1 |
| | | | | | | | | | Closes #1832 | ||||
| * | | Fix merge api and spec | Dmitriy Zaporozhets | 2015-08-04 | 1 | -1/+1 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Huge refactoring for accepting merge requests | Dmitriy Zaporozhets | 2015-07-16 | 1 | -1/+5 |
| |/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Rename abilities to correspond contoller/model action namesrename-abilities | Dmitriy Zaporozhets | 2015-06-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | write_ was renamed to create_ modify_ was renamed to update_ So now in update action we have next code def create can?(current_user, :create_issue, @issue) end def update can?(current_user, :update_issue, @issue) end Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Disable changing of the source branch in merge request update API | Stan Hu | 2015-05-29 | 1 | -2/+6 |
| | | |||||
| * | Query issues, merge requests and milestones with their IID through API | jubianchi | 2015-05-02 | 1 | -5/+11 |
| | | |||||
| * | Don't allow a merge request to be merged when its title starts with "WIP". | Douwe Maan | 2015-04-30 | 1 | -2/+2 |
| | | |||||
| * | Refactor GitAccess to use instance variables. | Douwe Maan | 2015-03-24 | 1 | -1/+2 |
| | | |||||
| * | Refactor and improve sorting objects in API for projects, issues and merge ↵ | Dmitriy Zaporozhets | 2015-02-05 | 1 | -18/+13 |
| | | | | | requests | ||||
| * | Added a way to retrieve MR files | Jeroen van Baarsen | 2015-02-04 | 1 | -0/+16 |
| | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | ||||
| * | developer can push to protected branches | Valery Sizov | 2015-01-20 | 1 | -6/+2 |
| | | |||||
| * | Fix failing tests due to updates on the return messages. | Marin Jankovski | 2015-01-07 | 1 | -1/+1 |
| | | |||||
| * | Add a message when unable to save an object through api. | Marin Jankovski | 2015-01-07 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'api/improve-error-reporting' of ↵ | Dmitriy Zaporozhets | 2014-09-23 | 1 | -2/+7 |
| |\ | | | | | | | https://github.com/jubianchi/gitlabhq into jubianchi-api/improve-error-reporting | ||||
| | * | Improve error reporting on users API | jubianchi | 2014-09-16 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | * users (#6878, #3526, #4209): Validation error messages are now exposed through 400 responses, 409 response are sent in case of duplicate email or username * MRs (#5335): 409 responses are sent in case of duplicate merge request (source/target branches), 422 responses are sent when submiting MR fo/from unrelated forks * issues * labels * projects | ||||
| * | | Fix typo in comment. | Marin Jankovski | 2014-09-16 | 1 | -1/+1 |
| | | | |||||
| * | | Ordering and sorting for MR in api. | Marin Jankovski | 2014-09-15 | 1 | -0/+14 |
| |/ | |||||
| * | Fix tests after #7526 | Robert Schilling | 2014-08-20 | 1 | -5/+6 |
| | | |||||
| * | Do label validation for issues/merge requests API | Robert Schilling | 2014-08-14 | 1 | -0/+12 |
| | | |||||
| * | Fix old api compatibility and tests | Dmitriy Zaporozhets | 2014-07-30 | 1 | -2/+10 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Remove thread vars usage from API notes and mr's | Dmitriy Zaporozhets | 2014-06-10 | 1 | -11/+8 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Merge pull request #6778 from dblessing/feature/mr_labels | Dmitriy Zaporozhets | 2014-05-13 | 1 | -0/+4 |
| |\ | | | | | Merge Request Labels | ||||
| | * | Implement Merge Request Labels | Drew Blessing | 2014-05-13 | 1 | -0/+4 |
| | | | |||||
| * | | Add some tests for merge API | Dmitriy Zaporozhets | 2014-05-13 | 1 | -2/+2 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Docs for merge api | Dmitriy Zaporozhets | 2014-05-12 | 1 | -0/+1 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Specify error codes for merge api | Dmitriy Zaporozhets | 2014-05-12 | 1 | -9/+12 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Draft API method for merge MR | Dmitriy Zaporozhets | 2014-05-12 | 1 | -0/+39 |
| |/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Add optional parameter to list merge requests | Stuart Pook | 2014-04-07 | 1 | -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. | ||||
| * | Use MergeRequest services in API and controllers | Dmitriy Zaporozhets | 2014-04-02 | 1 | -41/+17 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Add method to get the comments on a merge request | Stuart Pook | 2014-03-19 | 1 | -0/+16 |
| | | | | | | Add method to get the comments for a merge request and document that you can change the status of a merge request. | ||||
| * | Added description parameter support to Create and Update MR API endpoints ↵ | Greg Messner | 2014-03-03 | 1 | -2/+4 |
| | | | | | (issue-110). | ||||
| * | Refactor MR code reload | Dmitriy Zaporozhets | 2014-02-18 | 1 | -2/+0 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Merge branch 'improve/mr_diff' | Dmitriy Zaporozhets | 2014-01-23 | 1 | -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 created | Dmitriy Zaporozhets | 2014-01-22 | 1 | -1/+0 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Remove deprecated finders | skv | 2014-01-19 | 1 | -1/+1 |
| |/ | |||||
| * | Fixing unsafe use of Thread.current variable :current_user | Angus MacArthur | 2013-10-16 | 1 | -37/+42 |
| | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |