Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-09-06Re-annotate modelsStan Hu
2015-08-11Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets
This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
2015-08-11Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets
This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04Improve tests to use real branches in merge requestsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22Use to_reference for issue and merge request mentionable specsRobert Speicher
2015-06-22Update mock and stub syntax for specsRobert Speicher
2015-05-26Make use of to_reference in more specsRobert Speicher
2015-05-26Minor model spec cleanupsRobert Speicher
Snippet model was missing project association
2015-05-26Add `to_reference` for models that support referencesRobert Speicher
Now there is a single source of information for which attribute a model uses to be referenced, and its special character.
2015-04-30Don't allow a merge request to be merged when its title starts with "WIP".Douwe Maan
2015-04-16Correct usage of `subject` in specsRobert Speicher
2015-02-12Updated rspec to rspec 3.x syntaxJeroen van Baarsen
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-01-22Annotate modelsDmitriy Zaporozhets
2014-10-06Add specs for tasksVinnie Okada
Add tests for the new task list functionality in the Markdown parser and in issues and merge requests.
2014-08-25Annotate modelsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-27Remove mass assgnment specsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-13Detect closing issues in Merge Request descriptionJacob Vosmaer
2014-05-28Fix testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-09Re-annotate modelsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-23Fix mr specsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-15fix most of warningsskv
2013-12-12Fix testDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-06Replace assign with stub for default_branchDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-10-07Fix merge request model specDmitriy Zaporozhets
2013-10-01Annotate!Dmitriy Zaporozhets
2013-08-26Link issues from comments and automatically close themash wilson
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.
2013-08-21ReannotateDmitriy Zaporozhets
2013-07-18Refactor merge api createIzaak Alpert
-Made the api method a little more readable -removed some missed extra newline's Change-Id: Ic38baafc813aaeda0a8b283f39916182c8ec37d5
2013-07-18Merge Request on forked projectsIzaak Alpert
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
2013-06-19AnnotatedDmitriy Zaporozhets
2013-05-05remove trailing spacesAndrey Kumanyaev
2013-03-15reannotatedDmitriy Zaporozhets
2013-02-20State machine added for merge_status fieldAndrew8xx8
2013-02-18Merge Request uses StateMachine nowAndrew8xx8
2013-02-18Issuable consern uses StateMachine nowAndrew8xx8
2013-02-18State renamed to merge_statusAndrew8xx8
2013-01-05Tests are fixed nowDmitriy Zaporozhets
2013-01-03Fixed tests. added test for gitlab_ci_service modelDmitriy Zaporozhets
2012-12-18Split commit_id and noteable_id for NoteDmitriy Zaporozhets
2012-11-19Annotated. schema updatedDmitriy Zaporozhets
2012-11-13Merge pull request #1928 from kouno/cleanup-factoriesDmitriy Zaporozhets
Remove backward compatibility of factories.
2012-11-13Remove backward compatibility of factories.Vincent Bonmalais
2012-11-07AnnotatedDmitriy Zaporozhets
2012-10-11Separate observing of Note and MergeRequestsRobb Kidd
* 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.
2012-10-10Make MRs also count and display its commits' notesRiyad Preukschas
2012-10-09AnnotatedDmitriy Zaporozhets
2012-09-26set activerecord whitelist_attributes to trueNihad Abbasov
2012-09-08Rename Upvote role to VotesRiyad Preukschas
2012-08-29Add more coverage for model validations and associationsRobert Speicher
2012-08-29Remove annotations from specsRobert Speicher