diff options
| author | Heinrich Lee Yu <heinrich@gitlab.com> | 2018-11-30 10:33:02 +0800 |
|---|---|---|
| committer | Heinrich Lee Yu <hleeyu@gmail.com> | 2018-12-19 17:58:53 +0800 |
| commit | ddb1d326e06cc40d87b8eaa40aab7019447d6e5e (patch) | |
| tree | 7c5b05c1caf9abd59f5c7ccbb7546c56920e1ac1 /app/views/projects/merge_requests | |
| parent | 9f9765485e998ece87660aa30a1b4339bb940d14 (diff) | |
| download | gitlab-ce-ddb1d326e06cc40d87b8eaa40aab7019447d6e5e.tar.gz | |
Pass in just assignees instead of issuable
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/conflicts/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/show.html.haml | 4 |
2 files changed, 7 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 ede37c11e64..fb176441485 100644 --- a/app/views/projects/merge_requests/conflicts/show.html.haml +++ b/app/views/projects/merge_requests/conflicts/show.html.haml @@ -6,6 +6,10 @@ .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), diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml index 4ebf8afd669..0271dee353b 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -86,7 +86,9 @@ .mr-loading-status = spinner -= render 'shared/issuable/sidebar', issuable: @merge_request, issuable_sidebar: @issuable_sidebar +-# `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 - if @merge_request.can_be_reverted?(current_user) = render "projects/commit/change", type: 'revert', commit: @merge_request.merge_commit, title: @merge_request.title |