• Izaak Alpert's avatar
    Merge Request on forked projects · 3d7194f0
    Izaak Alpert authored
    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
    3d7194f0
_merge_request.html.haml 1.14 KB
%li{ class: mr_css_classes(merge_request) }
  .merge-request-title
    %span.light= "##{merge_request.id}"
    = link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.target_project, merge_request), class: "row_title"
    - if merge_request.merged?
      %small.pull-right
        %i.icon-ok
        = "MERGED"
    - else
      %span.pull-right
        = "#{merge_request.source_project.path_with_namespace}/#{merge_request.source_branch}"
        %i.icon-angle-right
        = "#{merge_request.target_project.path_with_namespace}/#{merge_request.target_branch}"
  .merge-request-info
    - if merge_request.author
      authored by #{link_to_member(merge_request.source_project, merge_request.author)}
    - if merge_request.votes_count > 0
      = render 'votes/votes_inline', votable: merge_request
    - if merge_request.notes.any?
      %span
        %i.icon-comments
        = merge_request.mr_and_commit_notes.count
    - if merge_request.milestone_id?
      %span
        %i.icon-time
        = merge_request.milestone.title


    .pull-right
      %small updated #{time_ago_in_words(merge_request.updated_at)} ago