22 Sep, 2013

2 commits


04 Sep, 2013

1 commit


25 Aug, 2013

1 commit

  • Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
    references in descriptions, titles, or attached Notes creates a back-reference
    Note that links to the original referencer. Furthermore, pushing commits with
    commit messages that match a (configurable) regexp to a project's default
    branch will close any issues mentioned by GFM in the matched closing phrase.
    If accepting a merge request would close any Issues in this way, a banner is
    appended to the merge request's main panel to indicate this.
    ash wilson
     

21 Aug, 2013

1 commit


08 Aug, 2013

1 commit


30 Jul, 2013

2 commits


29 Jul, 2013

1 commit


17 Jul, 2013

5 commits

  • -Fixed tests to account for this
    -Trigger update after update_branches for list:update selecting first commit, have it also trigger sha lookup
    
    Change-Id: Ie4c3d4fbf57aeadd7d141d3704f4ea0f0684a7a5
    Izaak Alpert
     
  • -Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow
    
    Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
    Izaak Alpert
     
  • -The forked merge request test now tests it's componenets again, and seems to work every time (did this by reordering the branch updates so their is more time for update_branches to run) -- this could still technically fail, but after several runs it doesn't seem to.
    -Removed todo in merge_request, pushed wrapping of grit down to the satellite
    -updated action test to check flock status, made it nolonger pending
    -moved all logging on failure to helper method in satellite
    GITLAB-592
    
    Change-Id: If0554ca35eedc3d3e8461f7d93d4b3939fa2cd75
    Izaak Alpert
     
  • -Disable observers post test run
    -Allow db:seed_fu RAILS_ENV=test to be run more than once without error
    -fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned
    -make notes/commits render against proper project
    -MR discussion file links should reference note's project
    -Added tests for commit links on edit merge request
    -fixes edit issues (canceling an edited mr, updating an edited mr)
    -updates tests with checks for source code updates
    -still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set)
    
    MR API: error on bad target_project
    
    -If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target
    -Fixes some busted (but hidden) test cases
    
    Conflicts:
    	app/views/merge_requests/show/_diffs.html.haml
    	spec/features/notes_on_merge_requests_spec.rb
    
    Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
    Izaak Alpert
     
  • 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

  • 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

  • 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