diff options
| author | Phil Hughes <me@iamphill.com> | 2019-06-14 14:01:24 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-06-14 14:01:24 +0100 |
| commit | d2fd6bd51036be836c2c793e2bd7a503c7ad9030 (patch) | |
| tree | fe86f4b3dca7f33ec37be2c75ea061afafcdb4fe /app/views/projects/merge_requests | |
| parent | 577832598f1b35187efafc426068ef7ac36ae09f (diff) | |
| download | gitlab-ce-d2fd6bd51036be836c2c793e2bd7a503c7ad9030.tar.gz | |
Added diff suggestion popover
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56523
Diffstat (limited to 'app/views/projects/merge_requests')
| -rw-r--r-- | app/views/projects/merge_requests/show.html.haml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml index a201fafb949..f593f4e049e 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -80,7 +80,9 @@ current_user_data: UserSerializer.new(project: @project).represent(current_user, {}, MergeRequestUserEntity).to_json, project_path: project_path(@merge_request.project), changes_empty_state_illustration: image_path('illustrations/merge_request_changes_empty.svg'), - is_fluid_layout: fluid_layout.to_s } } + is_fluid_layout: fluid_layout.to_s, + dismiss_endpoint: user_callouts_path, + show_suggest_popover: show_suggest_popover?.to_s } } .mr-loading-status = spinner |