Welcome to mirror list, hosted at ThFree Co, Russian Federation.

_diffs.html.haml « diffs « merge_requests « projects « views « app - gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
blob: 0d30d6da68fe7e961b1e9899ca32d05ec0bbbb99 (plain)
1
2
3
4
5
- if @merge_request_diff.collected? || @merge_request_diff.overflow?
  = render 'projects/merge_requests/diffs/versions'
  = render "projects/diffs/diffs", diffs: @diffs, environment: @environment, merge_request: true
- elsif @merge_request_diff.empty?
  .nothing-here-block Nothing to merge from #{@merge_request.source_branch} into #{@merge_request.target_branch}