diff options
| author | Heinrich Lee Yu <heinrich@gitlab.com> | 2018-11-28 00:53:16 +0800 |
|---|---|---|
| committer | Heinrich Lee Yu <hleeyu@gmail.com> | 2018-12-19 17:58:53 +0800 |
| commit | 9f9765485e998ece87660aa30a1b4339bb940d14 (patch) | |
| tree | 0615fe12d0780847dee1c0dca8c0f0d59674048f /app/views/projects/merge_requests/conflicts | |
| parent | 6c79e9307e116d6115f6d76ac796176952fb83cd (diff) | |
| download | gitlab-ce-9f9765485e998ece87660aa30a1b4339bb940d14.tar.gz | |
Refactor sidebar to use data from serializer
Diffstat (limited to 'app/views/projects/merge_requests/conflicts')
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/conflicts/show.html.haml b/app/views/projects/merge_requests/conflicts/show.html.haml index a6e2565a485..ede37c11e64 100644 --- a/app/views/projects/merge_requests/conflicts/show.html.haml +++ b/app/views/projects/merge_requests/conflicts/show.html.haml @@ -6,7 +6,7 @@ .merge-request-details.issuable-details = render "projects/merge_requests/mr_box" -= render 'shared/issuable/sidebar', issuable: @merge_request += render 'shared/issuable/sidebar', issuable: @merge_request, issuable_sidebar: @issuable_sidebar #conflicts{ "v-cloak" => "true", data: { conflicts_path: conflicts_project_merge_request_path(@merge_request.project, @merge_request, format: :json), resolve_conflicts_path: resolve_conflicts_project_merge_request_path(@merge_request.project, @merge_request) } } |