diff options
| author | Phil Hughes <me@iamphill.com> | 2017-02-08 14:58:08 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-02-09 15:54:19 +0000 |
| commit | f9c58d938851ca63b8c4ff5d2bf9324aa6541170 (patch) | |
| tree | 713127bf117b0318c296870f9717b5f7542a176c /app/views/projects/merge_requests/_show.html.haml | |
| parent | 4975f4160ac65b3d9ae51d074efcb61bb63cf6b4 (diff) | |
| download | gitlab-ce-f9c58d938851ca63b8c4ff5d2bf9324aa6541170.tar.gz | |
Refactored diff notes Vue app
It now relies on its Vue bundle rather than the window. Fixes some reactivity issues that was happening in EE
Diffstat (limited to 'app/views/projects/merge_requests/_show.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index 83250443bea..dd615d3036c 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -3,10 +3,9 @@ - page_description @merge_request.description - page_card_attributes @merge_request.card_attributes - content_for :page_specific_javascripts do - = page_specific_javascript_bundle_tag('lib_vue') = page_specific_javascript_bundle_tag('diff_notes') -.merge-request{ 'data-url' => merge_request_path(@merge_request) } +.merge-request{ 'data-url' => merge_request_path(@merge_request), 'data-project-path' => project_path(@merge_request.project) } = render "projects/merge_requests/show/mr_title" .merge-request-details.issuable-details{ data: { id: @merge_request.project.id } } |