diff options
Diffstat (limited to 'app/views/projects/merge_requests/show.html.haml')
-rw-r--r-- | app/views/projects/merge_requests/show.html.haml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/views/projects/merge_requests/show.html.haml b/app/views/projects/merge_requests/show.html.haml index a7667d03138..008f2588dbd 100644 --- a/app/views/projects/merge_requests/show.html.haml +++ b/app/views/projects/merge_requests/show.html.haml @@ -76,14 +76,12 @@ = render "projects/merge_requests/tabs/pane", name: "pipelines", id: "pipelines", class: "pipelines" do - if @number_of_pipelines.nonzero? = render 'projects/commit/pipelines_list', disable_initialization: true, endpoint: pipelines_project_merge_request_path(@project, @merge_request) - - params = request.query_parameters - - if Feature.enabled?(:default_merge_ref_for_diffs, @project, default_enabled: :yaml) - - params = params.merge(diff_head: true) + - params = request.query_parameters.merge(diff_head: true) = render "projects/merge_requests/tabs/pane", name: "diffs", id: "js-diffs-app", class: "diffs", data: diffs_tab_pane_data(@project, @merge_request, params) .mr-loading-status .loading.hide - .gl-spinner.gl-spinner-md + = gl_loading_icon(size: 'lg') = render 'shared/issuable/sidebar', issuable_sidebar: @issuable_sidebar, assignees: @merge_request.assignees, reviewers: @merge_request.reviewers, source_branch: @merge_request.source_branch @@ -94,5 +92,8 @@ #js-review-bar +- if Feature.enabled?(:mr_attention_requests, default_enabled: :yaml) + #js-need-attention-sidebar-onboarding + = render 'projects/invite_members_modal', project: @project = render 'shared/web_ide_path' |