kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Link mr commits/diffs to target project 

Now when changes in merge requests stored in target project we can
always link commits and diffs to target project. So even people without
access to fork can browse commits and diffs

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2015-08-07 13:05:52 +02:00
parent 86bccb71a1
commit fe4b065202
No known key found for this signature in database
GPG Key ID: 161B5D6A44D3D88A
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/projects/merge_requests/show/_commits.html.haml
View File

@ -1 +1 @@
= render "projects/commits/commits", project: @merge_request.source_project
= render "projects/commits/commits", project: @merge_request.project

2
app/views/projects/merge_requests/show/_diffs.html.haml
View File

@ -1,5 +1,5 @@
- if @merge_request_diff.collected?
= render "projects/diffs/diffs", diffs: @merge_request.diffs, project: @merge_request.source_project
= render "projects/diffs/diffs", diffs: @merge_request.diffs, project: @merge_request.project
- elsif @merge_request_diff.empty?
.nothing-here-block Nothing to merge from #{@merge_request.source_branch} into #{@merge_request.target_branch}
- else