24 Mar, 2014

1 commit

17 Jul, 2013

1 commit

  • 3d7194f0   Merge Request on forked projects ... Browse File » 
    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
     

10 Apr, 2013

1 commit

01 Apr, 2013

1 commit

26 Mar, 2013

1 commit

21 Mar, 2013

1 commit

10 Mar, 2013

1 commit

21 Feb, 2013

2 commits

11 Feb, 2013

1 commit

04 Feb, 2013

1 commit

09 Jan, 2013

1 commit

07 Jan, 2013

1 commit

02 Jan, 2013

2 commits

20 Dec, 2012

1 commit

21 Nov, 2012

1 commit

16 Nov, 2012

1 commit

26 Sep, 2012

1 commit

29 Aug, 2012

1 commit

28 Aug, 2012

2 commits

25 Aug, 2012

2 commits

23 Aug, 2012

1 commit

19 Aug, 2012

1 commit

13 Aug, 2012

1 commit

10 Aug, 2012

1 commit

28 Jun, 2012

1 commit

20 Jun, 2012

1 commit

  • dfb5da9d   Disable observers in specs. Enable only when observer is under test. ... Browse File » 
    Used the built-in observer enable/disable feature in ActiveModel[1].
ActiveRecord::Base includes ActiveModel::Observing which provides this
behavior.

Simple wraps to enable the observer under test were added to the specs
for: ActivityObserver, IssueObserver, Admin::Users and Issues.

The spec for Project.last_activity was refactored to separate the tests
for #last_activity and #last_activity_date. Each had doubles added to
isolate the spec from the hidden dependency on the ActivityObserver
action to create an Event for the project when an Issue is created. This
ActivityObserver behavior is already tested by its spec.

[1] http://api.rubyonrails.org/classes/ActiveModel/ObserverArray.html
    Robb Kidd
     

15 May, 2012

1 commit

14 Dec, 2011

1 commit

  • edab46e9   Added web hooks functionality ... Browse File » 
    This commit includes:

 * Projects can have zero or more WebHooks.
 * The PostReceive job will ask a project to execute any web hooks defined for that project.
 * WebHook has a URL, we post Github-compatible JSON to that URL.
 * Failure to execute a WebHook will be silently ignored.
    Ariejan de Vroom
     

16 Nov, 2011

1 commit

26 Oct, 2011

1 commit

09 Oct, 2011

1 commit