gitlab-org--gitlab-foss/app/views/projects/merge_requests/show/_commits.html.haml

- 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
        - if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
          %ul.all-commits.hide.well-list
            - @commits.first(MergeRequestDiff::COMMITS_SAFE_SIZE).each do |commit|
              = render "projects/commits/inline_commit", commit: commit, project: @merge_request.source_project
            %li
              other #{@commits.size - MergeRequestDiff::COMMITS_SAFE_SIZE} commits hidden top prevent performance issues.
        - else
          %ul.all-commits.hide.well-list
            - @commits.each do |commit|
              = render "projects/commits/inline_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
remove double negative 2012-06-20 21:21:13 +00:00			`- if @commits.present?`
Show commits for merge request immediatly 2012-02-14 23:15:02 +00:00			`.ui-box`
Replace %h5.title with div.title 2013-07-13 17:36:21 +00:00			`.title`
Admin logs improved. Commits list box styled 2012-07-16 05:03:10 +00:00			`%i.icon-list`
			`Commits (#{@commits.count})`
Converted merge_requests.js to coffeescript and updated code 2013-01-05 01:18:39 +00:00			`.commits`
MR commits suppressed if too many. few icons 2012-04-17 19:08:07 +00:00			`- if @commits.count > 8`
Converted merge_requests.js to coffeescript and updated code 2013-01-05 01:18:39 +00:00			`%ul.first-commits.well-list`
Remove trailing whitespaces and trailing lines 2012-06-03 22:37:27 +00:00			`- @commits.first(8).each do \|commit\|`
Merge Request on forked projects 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 2013-04-25 14:15:33 +00:00			`= render "projects/commits/commit", commit: commit, project: @merge_request.source_project`
Remove trailing whitespaces and trailing lines 2012-06-03 22:37:27 +00:00			`%li.bottom`
MR commits suppressed if too many. few icons 2012-04-17 19:08:07 +00:00			`8 of #{@commits.count} commits displayed.`
Remove trailing whitespaces and trailing lines 2012-06-03 22:37:27 +00:00			`%strong`
Converted merge_requests.js to coffeescript and updated code 2013-01-05 01:18:39 +00:00			`%a.show-all-commits Click here to show all`
Improve commit render performnace for MR show page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 2014-01-22 13:54:53 +00:00			`- if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE`
			`%ul.all-commits.hide.well-list`
			`- @commits.first(MergeRequestDiff::COMMITS_SAFE_SIZE).each do \|commit\|`
			`= render "projects/commits/inline_commit", commit: commit, project: @merge_request.source_project`
			`%li`
			`other #{@commits.size - MergeRequestDiff::COMMITS_SAFE_SIZE} commits hidden top prevent performance issues.`
			`- else`
			`%ul.all-commits.hide.well-list`
			`- @commits.each do \|commit\|`
			`= render "projects/commits/inline_commit", commit: commit, project: @merge_request.source_project`
MR commits suppressed if too many. few icons 2012-04-17 19:08:07 +00:00
Remove trailing whitespaces and trailing lines 2012-06-03 22:37:27 +00:00			`- else`
Refactor css lists. Use well-list class 2012-12-18 03:14:05 +00:00			`%ul.well-list`
Remove trailing whitespaces and trailing lines 2012-06-03 22:37:27 +00:00			`- @commits.each do \|commit\|`
Merge Request on forked projects 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 2013-04-25 14:15:33 +00:00			`= render "projects/commits/commit", commit: commit, project: @merge_request.source_project`
merge request: notes, diffs, commits 2011-11-28 20:16:57 +00:00