17 Jul, 2013

1 commit

  • 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
     

18 Jun, 2013

1 commit

05 Jun, 2013

2 commits

01 Jun, 2013

1 commit

16 May, 2013

1 commit

08 May, 2013

1 commit

02 May, 2013

1 commit

27 Apr, 2013

1 commit

16 Apr, 2013

2 commits

15 Apr, 2013

1 commit

10 Apr, 2013

2 commits

03 Apr, 2013

4 commits

01 Apr, 2013

1 commit

31 Mar, 2013

1 commit

21 Mar, 2013

1 commit

16 Mar, 2013

1 commit

  • 330fe416   Fix Wiki migration task and add more test coverage. ... Browse Dir » 
    There was an error in the #extract_attributes_from_page method that
caused an exception when checking to see if a page named "Home"
already exists.

The check occurs to handle the renaming of the main index page to
"Home" to match the Gollum standard. If there is already a page
called "Home" then the migrator will leave that page and create
the Index page as usual. Users will need to manually rename their
old "Home" page to something else then rename their "Index" page
to "Home". Fortunately, I would be highly surprised if this case
ever comes up.

I also added more verbosity to the logging so if an error does
occur, it will be easier to track down which Wiki page is causing
the problem.
    Dan Knox
     

15 Mar, 2013

1 commit

12 Mar, 2013

1 commit

10 Mar, 2013

1 commit

  • f0aa54e0   Create Wiki migration task. ... Browse Dir » 
    This commit adds a new Rake task for migrating all of your existing
Wiki content from your database into new Gollum repositories.

The bulk of the logic happens within the `WikiToGollumMigrator`
class which is decently test covered and located in the lib directory.

The new Rake task can be executed by running:

   `bundle exec rake gitlab:wiki:migrate`

It will output a nice log of every project that it migrates along
with success or failure messages.

I have used it on my own installation to migrate my Wikis successfully.
    Dan Knox
     

27 Feb, 2013

1 commit

26 Feb, 2013

1 commit

11 Feb, 2013

1 commit

05 Feb, 2013

2 commits

28 Jan, 2013

2 commits

23 Jan, 2013

1 commit

15 Jan, 2013

2 commits

  • 752eb2c1   more tests fixed Browse Dir »
    Dmitriy Zaporozhets
     
  • 30227869   Merge commit 'master' into discussions ... Browse Dir » 
    Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb
    Riyad Preukschas
     

05 Jan, 2013

1 commit

03 Jan, 2013

1 commit

02 Jan, 2013

2 commits

25 Dec, 2012

1 commit