diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-30 14:35:33 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-07-30 14:35:33 +0400 |
| commit | 0d715bcd812ca6c99884e117f28a400669aa8e57 (patch) | |
| tree | 5690fa43c790af40c51441425b9d8be068d4139d /app/views/projects/merge_requests/branch_from.js.haml | |
| parent | 4f07a6a99cab8f8ae3ad0a786a6cc9a837955c08 (diff) | |
| parent | 4d373005968b8269a8d2fe56b7776820396127a4 (diff) | |
Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork
Conflicts:
app/views/projects/commit/show.html.haml
app/views/projects/compare/show.html.haml
app/views/projects/merge_requests/branch_from.js.haml
Diffstat (limited to 'app/views/projects/merge_requests/branch_from.js.haml')
| -rw-r--r-- | app/views/projects/merge_requests/branch_from.js.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/branch_from.js.haml b/app/views/projects/merge_requests/branch_from.js.haml index 1d6b10f03ae..d0a148575dc 100644 --- a/app/views/projects/merge_requests/branch_from.js.haml +++ b/app/views/projects/merge_requests/branch_from.js.haml @@ -1,5 +1,5 @@ :plain - $(".mr_source_commit").html("#{commit_to_html(@commit)}"); + $(".mr_source_commit").html("#{commit_to_html(@commit, @source_project)}"); var mrTitle = $('#merge_request_title'); if(mrTitle.is(":empty")) { |