summaryrefslogtreecommitdiff
path: root/spec/requests/api/merge_requests_spec.rb
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Added '/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues' ↵Gal Schlezinger2016-02-111-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
* | Add an API spec for MergeRequest#merge_status and properly document this ↵develop7/add-merge_status-to-merge-request-in-apiRémy Coutable2016-02-081-0/+1
|/ | | | resource
* Improve consistency and duplication for Merge Request APIimprove-mr-apiDmitriy Zaporozhets2016-01-281-31/+31
| | | | | | | * Follow REST for merge request API route * Remove repeating comments API for MR Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fixed Rubocop offensesGabriel Mazetto2015-12-151-1/+1
|
* Merge branch 'master' into merge-if-greenZeger-Jan van de Weg2015-12-071-0/+17
|\
| * Add API endpoint to fetch merge request commits listDmitriy Zaporozhets2015-12-041-0/+17
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Incorporate feedbackZeger-Jan van de Weg2015-12-051-1/+1
| |
* | Specs for 'Merge When Build Succeeds'Zeger-Jan van de Weg2015-12-021-2/+15
|/
* Fix bug where merge request comments created by API would not trigger ↵Stan Hu2015-10-101-0/+5
| | | | | | notifications Closes https://github.com/gitlabhq/gitlabhq/issues/9715
* Fix broken sort in merge request APIStan Hu2015-09-151-12/+13
| | | | Closes #2266
* Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-14/+12
| | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-12/+14
| | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-041-2/+4
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Return comments in created order in merge request APIStan Hu2015-07-161-2/+4
| | | | | | | | Closes #1832
* | Fix merge api and specDmitriy Zaporozhets2015-08-041-14/+12
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' into rubocop-for-testsDmitriy Zaporozhets2015-06-231-5/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/issues_spec.rb spec/models/forked_project_link_spec.rb spec/models/hooks/service_hook_spec.rb spec/models/hooks/web_hook_spec.rb spec/models/project_services/hipchat_service_spec.rb spec/requests/api/project_members_spec.rb spec/requests/api/projects_spec.rb spec/requests/api/system_hooks_spec.rb spec/services/archive_repository_service_spec.rb spec/support/matchers.rb spec/tasks/gitlab/backup_rake_spec.rb
| * Merge branch 'revert-mr-state-names'Dmitriy Zaporozhets2015-06-221-3/+2
| |\ | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/merge_requests.rb
| | * Merge requests API returns closed for closed and merged for merged.revert-mr-state-namesDmitriy Zaporozhets2015-06-221-3/+2
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Update mock and stub syntax for specsRobert Speicher2015-06-221-2/+8
| |/
* | Fix Style/Blocks cop violationsRobert Speicher2015-06-221-2/+3
|/
* Change `foo.should` syntax to `expect(foo).to` in specsRobert Speicher2015-06-131-3/+3
|
* Disable changing of the source branch in merge request update APIStan Hu2015-05-291-2/+2
|
* Query issues, merge requests and milestones with their IID through APIjubianchi2015-05-021-0/+8
|
* Don't allow a merge request to be merged when its title starts with "WIP".Douwe Maan2015-04-301-0/+7
|
* Updated rspec to rspec 3.x syntaxJeroen van Baarsen2015-02-121-98/+99
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Fix testsDmitriy Zaporozhets2015-02-051-11/+14
|
* Refactor and improve sorting objects in API for projects, issues and merge ↵Dmitriy Zaporozhets2015-02-051-0/+4
| | | | requests
* Added a way to retrieve MR filesJeroen van Baarsen2015-02-041-0/+13
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Merge branch 'api/improve-error-reporting' of ↵Dmitriy Zaporozhets2014-09-231-11/+44
|\ | | | | | | https://github.com/jubianchi/gitlabhq into jubianchi-api/improve-error-reporting
| * Improve error reporting on users APIjubianchi2014-09-161-12/+45
| | | | | | | | | | | | | | | | * 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
* | Different created_at and updated_at time in api merge_requests spec.Marin Jankovski2014-09-151-31/+55
| |
* | Ordering and sorting for MR in api.Marin Jankovski2014-09-151-0/+32
|/
* Fix tests after #7526Robert Schilling2014-08-201-6/+7
|
* Do label validation for issues/merge requests APIRobert Schilling2014-08-141-1/+26
|
* Remove rails observers from applicationDmitriy Zaporozhets2014-06-171-2/+0
|
* More tests for merge apiDmitriy Zaporozhets2014-05-131-0/+15
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add some tests for merge APIDmitriy Zaporozhets2014-05-131-4/+11
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #6699 from criteo/api_get_open_merge_requestsDmitriy Zaporozhets2014-04-131-1/+33
|\ | | | | Add optional parameter to list merge requests
| * Add optional parameter to list merge requestsStuart Pook2014-04-071-1/+33
| | | | | | | | | | | | | | 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.
* | Added API testing groupJeroen van Baarsen2014-04-111-1/+1
|/
* More test fixesDmitriy Zaporozhets2014-04-031-12/+8
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add method to get the comments on a merge requestStuart Pook2014-03-191-0/+17
| | | | | Add method to get the comments for a merge request and document that you can change the status of a merge request.
* Added tests of Create and Update MR description.Greg Messner2014-03-101-1/+8
|
* Fix api merge request specsDmitriy Zaporozhets2014-01-221-17/+16
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Make changes to testsDmitriy Zaporozhets2014-01-221-3/+3
| | | | | | | * project_with_code -> project * project -> ermpty_project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Extend API Issues, MergeRequets, Milestones with iid fieldDmitriy Zaporozhets2013-10-141-0/+1
|
* Fix API::MergeRequestHiroyuki Sato2013-09-221-26/+26
| | | | Fixes #5144 Refs #4996
* Drop support of root namespace in routingHiroyuki Sato2013-09-131-28/+29
|
* MR on Fork multiple fixesIzaak Alpert2013-07-171-1/+14
| | | | | | | | | | | | | | | | | | | | | | | -Disable observers post test run -Allow db:seed_fu RAILS_ENV=test to be run more than once without error -fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned -make notes/commits render against proper project -MR discussion file links should reference note's project -Added tests for commit links on edit merge request -fixes edit issues (canceling an edited mr, updating an edited mr) -updates tests with checks for source code updates -still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set) MR API: error on bad target_project -If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target -Fixes some busted (but hidden) test cases Conflicts: app/views/merge_requests/show/_diffs.html.haml spec/features/notes_on_merge_requests_spec.rb Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
* Merge Request on forked projectsIzaak Alpert2013-07-171-31/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
View Lorry Controller Status