12 Aug, 2013

1 commit

30 Jul, 2013

1 commit

29 Jul, 2013

1 commit

17 Jul, 2013

3 commits

  • d9959427   Style changes from review with @randx ... Browse Dir » 
    -Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow

Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
    Izaak Alpert
     
  • 09112dbb   Rebase on master ... Browse Dir » 
    Trying to retrigger travis
Change-Id: Ifd86fb4c6b2791ad176230254fbf69a9ade979fb
    Izaak Alpert
     
  • 3d7194f0   Merge Request on forked projects ... Browse Dir » 
    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
    Izaak Alpert
     

25 Jun, 2013

2 commits

14 Jun, 2013

1 commit

11 Jun, 2013

2 commits

04 Jun, 2013

1 commit

25 May, 2013

1 commit

15 Apr, 2013

1 commit

10 Apr, 2013

1 commit

03 Apr, 2013

1 commit

01 Apr, 2013

1 commit

28 Mar, 2013

2 commits

26 Mar, 2013

6 commits

21 Mar, 2013

1 commit

19 Mar, 2013

2 commits

09 Mar, 2013

1 commit

  • ea9b3687   Replace current Wiki system with Gollum Wikis. ... Browse Dir » 
    This commit replaces the old database backed Wiki system with the
excellent Gollum git based Wiki system.

The UI has been updated to allow for utilizing the extra features
that Gollum provides. Specifically:

* Edit page now allows you to choose the content format.
* Edit page allows you to provide a commit message for the change.
* History page now shows Format, Commit Message, and Commit Hash.
* A new Git Access page has been added with the Wiki Repo URL.
* The default page has been changed to Home from Index to match
the Gollum standard.

The old Wiki model has been left in tact to provide for the
development of a migration script that will move all content stored
in the old Wiki system into new Gollum Wikis.
    Dan Knox
     

05 Mar, 2013

1 commit

01 Mar, 2013

1 commit

27 Feb, 2013

1 commit

25 Feb, 2013

1 commit

20 Feb, 2013

2 commits

18 Feb, 2013

3 commits

13 Feb, 2013

1 commit

11 Feb, 2013

1 commit