3d7194f011
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
30 lines
1,019 B
Text
30 lines
1,019 B
Text
- if @commits.present?
|
|
.ui-box
|
|
.title
|
|
%i.icon-list
|
|
Commits (#{@commits.count})
|
|
.commits
|
|
- if @commits.count > 8
|
|
%ul.first-commits.well-list
|
|
- @commits.first(8).each do |commit|
|
|
= render "projects/commits/commit", commit: commit, project: @merge_request.source_project
|
|
%li.bottom
|
|
8 of #{@commits.count} commits displayed.
|
|
%strong
|
|
%a.show-all-commits Click here to show all
|
|
%ul.all-commits.hide.well-list
|
|
- @commits.each do |commit|
|
|
= render "projects/commits/commit", commit: commit, project: @merge_request.source_project
|
|
|
|
- else
|
|
%ul.well-list
|
|
- @commits.each do |commit|
|
|
= render "projects/commits/commit", commit: commit, project: @merge_request.source_project
|
|
|
|
- else
|
|
%h4.nothing_here_message
|
|
Nothing to merge from
|
|
%span.label-branch #{@merge_request.source_branch}
|
|
to
|
|
%span.label-branch #{@merge_request.target_branch}
|
|
%br
|