10 Jun, 2014
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
13 May, 2014
3 commits
-
Merge Request Labels
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
12 May, 2014
3 commits
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
07 Apr, 2014
1 commit
-
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.
02 Apr, 2014
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
19 Mar, 2014
1 commit
-
Add method to get the comments for a merge request and document that you can change the status of a merge request.
03 Mar, 2014
1 commit
18 Feb, 2014
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
23 Jan, 2014
1 commit
-
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
22 Jan, 2014
1 commit
-
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
19 Jan, 2014
1 commit
16 Oct, 2013
1 commit
22 Sep, 2013
1 commit
-
Fixes #5144 Refs #4996
13 Sep, 2013
1 commit
17 Jul, 2013
3 commits
-
-Made the api method a little more readable -removed some missed extra newline's Change-Id: Ic38baafc813aaeda0a8b283f39916182c8ec37d5
-
-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
-
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
11 Jun, 2013
1 commit
14 May, 2013
1 commit
28 Mar, 2013
1 commit
07 Mar, 2013
1 commit
-
Conflicts: doc/api/projects.md spec/requests/api/projects_spec.rb
05 Mar, 2013
1 commit
27 Feb, 2013
2 commits
-
Added a helper method to check if required parameters are given in an API call. Can be used to return a `400 Bad Request` return code if a required attribute is missing. Code clean up and fixed tests.
-
The API documentation of merge requests contains info to status codes for all functions. Required arguments are now checked in the merge requests API functions and a `400 Bad Request` error is returned if they are not given.
20 Feb, 2013
1 commit
-
Conflicts: spec/requests/api/projects_spec.rb
18 Feb, 2013
1 commit
13 Feb, 2013
1 commit
-
Extracted a method for 400 error (Bad request) and adjusted code accordingly. The name of the missing attribute is used to show which one was missing from the request. It is used to give an appropriate message in the json response.
06 Feb, 2013
3 commits
-
Creating a comment to an existing merge request via API without providing a note returns a status code 400 now, suggesting a bad request. The reason for this is the resource itself (MR) exists but the required property is not set.
-
Using the API library to create or update a merge request at the moment a 404 error is returned. This is fine when the merge request in question does not exist, but does not provide good information that for example a required attribute is missing. A status code of 400 (Bad request) is returned when creating or updating a merge request when either `source_branch` or `target_branch` is missing. A status code of 409 is returned when `source_branch` and `target_branch` are the same. Tests are added for these cases.
21 Dec, 2012
1 commit
29 Nov, 2012
1 commit
25 Oct, 2012
2 commits
22 Oct, 2012
2 commits