diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-06-26 21:49:22 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-26 21:49:22 +0300 |
| commit | 53f77cfee164b3e0f7e3efb6511dee5e72dd75e6 (patch) | |
| tree | 7ed5580947af4b34c946f51403480fd6d5b01ed1 /app/views | |
| parent | 869d645069f46585b73b261c79aefece2fd87b08 (diff) | |
Added Diff Viewer to new VUE based MR page
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/merge_requests/show.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml index 4fe0ae17ec5..b23baa22d8b 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -73,7 +73,8 @@ = render 'projects/commit/pipelines_list', disable_initialization: true, endpoint: pipelines_project_merge_request_path(@project, @merge_request) #js-diffs-app.diffs.tab-pane{ data: { "is-locked" => @merge_request.discussion_locked?, endpoint: diffs_project_merge_request_path(@project, @merge_request, 'json', request.query_parameters), - current_user_data: UserSerializer.new(project: @project).represent(current_user, {}, MergeRequestUserEntity).to_json } } + current_user_data: UserSerializer.new(project: @project).represent(current_user, {}, MergeRequestUserEntity).to_json, + project_path: project_path(@merge_request.project)} } .mr-loading-status = spinner |