Commit graph

20 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
c2f1040006 Few fixes to spinach tests 2013-08-27 13:49:29 +03:00
Izaak Alpert
3d7194f011 Merge Request on forked projects
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-07-17 22:41:30 -04:00
Dmitriy Zaporozhets
fcc1ba5bf2 Fix spinach group 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets
52f312a8a8 fix group:people tests after prev commit 2013-06-11 13:54:58 +03:00
Andrey Kumanyaev
67ccc8b52a Replace old hashes with new 1.9 ruby hashes (rebase) 2013-05-05 18:01:10 +04:00
Dmitriy Zaporozhets
5c3cb47c16 Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into Undev-team-and-group-descriptions
Conflicts:
	db/schema.rb
2013-03-01 16:05:51 +02:00
Andrew8xx8
2f1f05d431 Fixed notes from randx 2013-02-28 18:55:35 +04:00
Dmitriy Zaporozhets
e8ff9ad2f2 Merge pull request #2249 from jouve/fix_possible_spec_failure
fix one of the possible causes of build failures
2013-02-28 06:45:16 -08:00
Andrew8xx8
cf6d9a2222 Tests for team and group descriptions added 2013-02-28 17:15:22 +04:00
Dmitriy Zaporozhets
e6002bdaff Ability to manage and remove group as owner outside of admin area 2013-02-01 19:04:11 +02:00
Dmitriy Zaporozhets
f6c482c06f User can create group 2013-01-24 17:47:09 +02:00
Cyril
4d19a4fbeb fix build failure
(https://travis-ci.org/gitlabhq/gitlabhq/builds/3593153)
2013-01-17 12:24:26 +01:00
Dmitriy Zaporozhets
dccd8b6eaa Continue refactoring. Use repostory and team 2013-01-04 08:43:25 +02:00
Dmitriy Zaporozhets
ce484fa9da Fixed admin -> group -> show 2013-01-02 20:45:11 +02:00
Dmitriy Zaporozhets
6a9e7dc55b Fixed spinach 2013-01-02 19:56:22 +02:00
Andrey Kumanyaev
655b836b2a test reanimated 2012-12-26 20:31:47 +04:00
Andrey Kumanyaev
25c5763780 Add functional in user section 2012-12-26 19:52:15 +04:00
Vincent Bonmalais
80fb38de7a Remove backward compatibility of factories. 2012-11-13 22:27:45 +11:00
randx
42abdf69d5 More group tests with spinach 2012-10-22 21:42:06 +03:00
Dmitriy Zaporozhets
8b76e30656 Spianch test for group dashboard 2012-10-03 13:42:17 +03:00