summaryrefslogtreecommitdiff
path: root/spec/controllers/merge_requests_controller_spec.rb
Commit message (Collapse)AuthorAgeFilesLines
* Move Projects::MergeRequestsController spec to its correct locationRobert Speicher2015-06-171-101/+0
|
* Fix "Revspec not found" errors when viewing diffs in a forked project with ↵Stan Hu2015-04-271-0/+20
| | | | | | submodules Closes #1413
* Upgrade to Rails 4.1.9Vinnie Okada2015-02-141-7/+14
| | | | | | Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers.
* Fixed hound warningsJeroen van Baarsen2015-02-121-1/+2
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Updated rspec to rspec 3.x syntaxJeroen van Baarsen2015-02-121-2/+2
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Fix MR controller testsDmitriy Zaporozhets2014-08-061-3/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Make changes to testsDmitriy Zaporozhets2014-01-221-1/+1
| | | | | | | * project_with_code -> project * project -> ermpty_project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix mr controller specsDmitriy Zaporozhets2014-01-141-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Drop support of root namespace in routingHiroyuki Sato2013-09-131-7/+7
|
* Fixing tests after adding iid for issues/mrDmitriy Zaporozhets2013-08-201-19/+8
|
* Merge Request on forked projectsIzaak Alpert2013-07-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Fix routing/controller specs for refactored controllersDmitriy Zaporozhets2013-06-231-2/+2
|
* Fix overlapping test case names.Douglas Huff2013-04-071-3/+3
|
* Use project_with_code factory where necessaryDmitriy Zaporozhets2013-04-011-1/+1
|
* should be green build now :)Dmitriy Zaporozhets2013-01-151-1/+1
|
* Rspec fixesDmitriy Zaporozhets2013-01-041-1/+1
|
* Fixing and commenting testsDmitriy Zaporozhets2012-11-261-9/+10
|
* Add specs for exporting merge requests as diff or patchRiyad Preukschas2012-11-251-0/+84
View Lorry Controller Status