Commit graph

26 commits

Author SHA1 Message Date
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
a3b42b6fa1 Remove dash projects search test 2013-06-19 18:24:18 +03:00
Dmitriy Zaporozhets
4a344c1683 Move search to separate layout 2013-06-06 13:38:13 +03:00
Dmitriy Zaporozhets
7786fe7ca8 Fixing specs & spinach since Wiki model does not exists any more 2013-04-10 23:48:40 +03:00
Andrew8xx8
fce22dfa2f Tests for dashboard projects fixed 2013-03-12 15:15:14 +04:00
Andrew8xx8
804ae05c58 Tests improved 2013-03-12 13:41:23 +04:00
Dmitriy Zaporozhets
d24fd32aa5 feature tests 2013-01-27 15:41:35 +02:00
Dmitriy Zaporozhets
20a4742efd Fixing team tests 2013-01-25 11:36:15 +02:00
AlexDenisov
0d9f73fa1e JavaScript removed from dashboard#index template. 2013-01-09 19:30:20 +00:00
Alex Denisov
f038057b9d Typo fixed 2013-01-09 19:30:20 +00:00
Alex Denisov
97d17cf835 Event filters stores at cookies. 2013-01-09 19:30:20 +00:00
Alex Denisov
b255c3c44b Tests on events filtering added 2013-01-09 19:30:20 +00:00
Alex Denisov
2b93201533 Tests on EventFilters added 2013-01-09 19:30:19 +00:00
Dmitriy Zaporozhets
8d8c161a7f Speedup dashboard via loading events with ajax 2013-01-07 14:36:01 +02:00
Alex Denisov
15a72a3b87 Spinach test added 2012-11-28 19:59:19 +02:00
Ilya Baryshev
e6524a919e Wiki search
Very basic, using LIKE, and no search snippets.
2012-10-16 23:05:11 +04:00
Dmitriy Zaporozhets
8b76e30656 Spianch test for group dashboard 2012-10-03 13:42:17 +03:00
Nihad Abbasov
0187ae4e86 actually fix the build 2012-10-02 15:32:59 +06:00
Robert Speicher
cada511f8b Add features for checking the "Active Tab" across various pages 2012-09-26 16:32:24 -04:00
Nihad Abbasov
d74f54736b rewrite dashboard feature steps using spinach 2012-09-10 02:20:12 -07:00
Alex Denisov
1f240b09ed User left project event added 2012-09-10 00:27:47 +03:00
Alex Denisov
a86bd87afc User joined project event added 2012-09-09 23:18:28 +03:00
Dmitriy Zaporozhets
6de4882597 Remove duplicate coverage in spec requests. All features should be covered in cucumber 2012-08-03 19:29:54 +03:00
randx
217810433b Better cucumber coverage for dashboard 2012-07-29 20:22:48 +03:00
randx
781fd1a80c Cucumber -> Dashboard features 2012-06-16 12:50:14 +03:00
Dmitriy Zaporozhets
5bbf3ccf05 Cucumber:
* Profile
* Browse code
* Sceleton for main features
* Wiki
* Commits
2012-06-15 07:15:28 +03:00