summaryrefslogtreecommitdiff
path: root/spec/models/merge_request_spec.rb
Commit message (Collapse)AuthorAgeFilesLines
* Handle removed source projects in MR CI commitsfix-merge-requests-without-source-projectsYorick Peterse2015-11-201-0/+25
| | | | | | | | When calling MergeRequest#ci_commit the code would previously raise an error if the source project no longer existed (e.g. because the user removed their fork). See #3599 for more information.
* Annotate modelsDmitriy Zaporozhets2015-11-131-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix: Inability to reply to code comments in the MR view, if the MR comes ↵comments_fixValery Sizov2015-10-221-0/+6
| | | | from a fork
* merge_request: add work_in_progress to MR hooksBen Boeckel2015-10-081-0/+11
|
* Re-annotate modelsStan Hu2015-09-061-0/+1
|
* Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-111-1/+1
| | | | | This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-111-1/+1
| | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Improve tests to use real branches in merge requestsDmitriy Zaporozhets2015-08-041-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use to_reference for issue and merge request mentionable specsRobert Speicher2015-06-221-3/+3
|
* Update mock and stub syntax for specsRobert Speicher2015-06-221-4/+6
|
* Make use of to_reference in more specsRobert Speicher2015-05-261-1/+1
|
* Minor model spec cleanupsRobert Speicher2015-05-261-13/+8
| | | | Snippet model was missing project association
* Add `to_reference` for models that support referencesRobert Speicher2015-05-261-3/+29
| | | | | Now there is a single source of information for which attribute a model uses to be referenced, and its special character.
* Don't allow a merge request to be merged when its title starts with "WIP".Douwe Maan2015-04-301-0/+26
|
* Correct usage of `subject` in specsRobert Speicher2015-04-161-2/+3
|
* Updated rspec to rspec 3.x syntaxJeroen van Baarsen2015-02-121-16/+16
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Annotate modelsDmitriy Zaporozhets2015-01-221-0/+1
|
* Add specs for tasksVinnie Okada2014-10-051-0/+4
| | | | | Add tests for the new task list functionality in the Markdown parser and in issues and merge requests.
* Annotate modelsDmitriy Zaporozhets2014-08-251-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove mass assgnment specsDmitriy Zaporozhets2014-06-261-2/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Detect closing issues in Merge Request descriptionJacob Vosmaer2014-06-131-0/+8
|
* Fix testsDmitriy Zaporozhets2014-05-281-19/+0
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Re-annotate modelsDmitriy Zaporozhets2014-04-091-4/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix mr specsDmitriy Zaporozhets2014-01-231-4/+3
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* fix most of warningsskv2013-12-151-3/+3
|
* Fix testDmitriy Zaporozhets2013-12-121-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Replace assign with stub for default_branchDmitriy Zaporozhets2013-11-061-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix merge request model specDmitriy Zaporozhets2013-10-071-2/+2
|
* Annotate!Dmitriy Zaporozhets2013-10-011-0/+1
|
* Link issues from comments and automatically close themash wilson2013-08-251-1/+30
| | | | | | | | | | Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown references in descriptions, titles, or attached Notes creates a back-reference Note that links to the original referencer. Furthermore, pushing commits with commit messages that match a (configurable) regexp to a project's default branch will close any issues mentioned by GFM in the matched closing phrase. If accepting a merge request would close any Issues in this way, a banner is appended to the merge request's main panel to indicate this.
* ReannotateDmitriy Zaporozhets2013-08-211-14/+16
|
* Refactor merge api createIzaak Alpert2013-07-171-1/+0
| | | | | | | -Made the api method a little more readable -removed some missed extra newline's Change-Id: Ic38baafc813aaeda0a8b283f39916182c8ec37d5
* Merge Request on forked projectsIzaak Alpert2013-07-171-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* AnnotatedDmitriy Zaporozhets2013-06-191-2/+2
|
* remove trailing spacesAndrey Kumanyaev2013-05-051-1/+1
|
* reannotatedDmitriy Zaporozhets2013-03-151-3/+2
|
* State machine added for merge_status fieldAndrew8xx82013-02-201-0/+6
|
* Merge Request uses StateMachine nowAndrew8xx82013-02-181-0/+4
|
* Issuable consern uses StateMachine nowAndrew8xx82013-02-181-31/+0
|
* State renamed to merge_statusAndrew8xx82013-02-181-1/+1
|
* Tests are fixed nowDmitriy Zaporozhets2013-01-051-1/+1
|
* Fixed tests. added test for gitlab_ci_service modelDmitriy Zaporozhets2013-01-031-2/+1
|
* Split commit_id and noteable_id for NoteDmitriy Zaporozhets2012-12-181-1/+1
|
* Annotated. schema updatedDmitriy Zaporozhets2012-11-191-11/+11
|
* Merge pull request #1928 from kouno/cleanup-factoriesDmitriy Zaporozhets2012-11-131-7/+7
|\ | | | | Remove backward compatibility of factories.
| * Remove backward compatibility of factories.Vincent Bonmalais2012-11-131-7/+7
| |
* | AnnotatedDmitriy Zaporozhets2012-11-071-0/+1
|/
* Separate observing of Note and MergeRequestsRobb Kidd2012-10-101-0/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | * Move is_assigned? and is_being_xx? methods to IssueCommonality This is behavior merge requests have in common with issues. Moved methods to IssueCommonality role. Put specs directly into merge_request_spec because setup differs for issues and MRs specifically in the "closed" factory to use. * Add MergeRequestObserver. Parallels IssueObserver in almost every way. Ripe for refactoring. * Rename MailerObserver to NoteObserver With merge request observing moved out of MailerObserver, all that was left was Note logic. Renamed to NoteObserver, added tests and updated application config for new observer names. Refactored NoteObserver to use the note's author and not rely on current_user. * Set current_user for MergeRequestObserver IssueObserver and MergeRequestObserver are the only observers that need a reference to the current_user that they cannot look up on the objects they are observing.
* Make MRs also count and display its commits' notesRiyad Preukschas2012-10-101-0/+15
|
* AnnotatedDmitriy Zaporozhets2012-10-091-0/+20
|
View Lorry Controller Status