diff options
| author | Heinrich Lee Yu <heinrich@gitlab.com> | 2018-11-30 12:03:35 +0800 |
|---|---|---|
| committer | Heinrich Lee Yu <hleeyu@gmail.com> | 2018-12-20 07:28:28 +0800 |
| commit | 95aae95a1cbb55facd127c74d6c044b13533f3fe (patch) | |
| tree | 6ecf27a219ee09f9e9d294d8304df2cb93c4da3d /app/views/projects/merge_requests/conflicts | |
| parent | 48d2c02efe7697914591d7381ce1c72d68eed336 (diff) | |
| download | gitlab-ce-95aae95a1cbb55facd127c74d6c044b13533f3fe.tar.gz | |
Code style changes and refactor
Diffstat (limited to 'app/views/projects/merge_requests/conflicts')
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/show.html.haml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/views/projects/merge_requests/conflicts/show.html.haml b/app/views/projects/merge_requests/conflicts/show.html.haml index fb176441485..09aeb81671a 100644 --- a/app/views/projects/merge_requests/conflicts/show.html.haml +++ b/app/views/projects/merge_requests/conflicts/show.html.haml @@ -6,12 +6,8 @@ .merge-request-details.issuable-details = render "projects/merge_requests/mr_box" --# `assignees` is required for populating selected assignee values in the select box and rendering the assignee link - This is should be removed when sidebar is converted to Vue. = render 'shared/issuable/sidebar', issuable_sidebar: @issuable_sidebar, assignees: @merge_request.assignees -= 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) } } .loading{ "v-if" => "isLoading" } |