Merge branch 'master' into 'update-kubeclient'

 Conflicts:
   Gemfile.lock

app/views/discussions/_discussion.html.haml

@@ -8,7 +8,7 @@
       .discussion.js-toggle-container{ data: { discussion_id: discussion.id } }
         .discussion-header
           .discussion-actions
-            %button.note-action-button.discussion-toggle-button.js-toggle-button{ type: "button" }
+            %button.note-action-button.discussion-toggle-button.js-toggle-button{ type: "button", class: ("js-toggle-lazy-diff" unless expanded) }
               - if expanded
                 = icon("chevron-up")
               - else

app/views/peek/views/_gc.html.haml

+- local_assigns.fetch(:view)
+
+%span.bold
+  %span{ title: 'Invoke Time', data: { defer_to: "#{view.defer_key}-gc_time" } }...
+  \/
+  %span{ title: 'Invoke Count', data: { defer_to: "#{view.defer_key}-invokes" } }...
+gc

app/views/peek/views/_gitaly.html.haml

 - local_assigns.fetch(:view)
-%strong
-  %span{ data: { defer_to: "#{view.defer_key}-duration" } } ...
+%button.btn-blank.btn-link.bold{ type: 'button', data: { toggle: 'modal', target: '#modal-peek-gitaly-details' } }
+  %span{ data: { defer_to: "#{view.defer_key}-duration" } }...
   \/
-  %span{ data: { defer_to: "#{view.defer_key}-calls" } } ...
-  Gitaly
+  %span{ data: { defer_to: "#{view.defer_key}-calls" } }...
+#modal-peek-gitaly-details.modal{ tabindex: -1, role: 'dialog' }
+  .modal-dialog.modal-full
+    .modal-content
+      .modal-header
+        %button.close{ type: 'button', data: { dismiss: 'modal' }, 'aria-label' => 'Close' }
+          %span{ 'aria-hidden' => 'true' }
+            ×
+        %h4
+          Gitaly requests
+      .modal-body{ data: { defer_to: "#{view.defer_key}-details" } }...
+gitaly

app/views/peek/views/_redis.html.haml

+- local_assigns.fetch(:view)
+
+%span.bold
+  %span{ data: { defer_to: "#{view.defer_key}-duration" } }...
+  \/
+  %span{ data: { defer_to: "#{view.defer_key}-calls" } }...
+redis

app/views/peek/views/_sidekiq.html.haml

+- local_assigns.fetch(:view)
+
+%span.bold
+  %span{ data: { defer_to: "#{view.defer_key}-duration" } }...
+  \/
+  %span{ data: { defer_to: "#{view.defer_key}-calls" } }...
+sidekiq

app/views/peek/views/_sql.html.haml

-%strong
-  %a.js-toggle-modal-peek-sql
-    %span{ data: { defer_to: "#{view.defer_key}-duration" } }...
-    \/
-    %span{ data: { defer_to: "#{view.defer_key}-calls" } }...
+%button.btn-blank.btn-link.bold{ type: 'button', data: { toggle: 'modal', target: '#modal-peek-pg-queries' } }
+  %span{ data: { defer_to: "#{view.defer_key}-duration" } }...
+  \/
+  %span{ data: { defer_to: "#{view.defer_key}-calls" } }...
 #modal-peek-pg-queries.modal{ tabindex: -1 }
   .modal-dialog.modal-full
     .modal-content
       .modal-header
-        %button.close.btn.btn-link.btn-sm{ type: 'button', data: { dismiss: 'modal' } } X
+        %button.close{ type: 'button', data: { dismiss: 'modal' }, 'aria-label' => 'Close' }
+          %span{ 'aria-hidden' => 'true' }
+            ×
         %h4
           SQL queries
       .modal-body{ data: { defer_to: "#{view.defer_key}-queries" } }...

app/views/projects/services/_form.html.haml

@@ -15,11 +15,6 @@
         .footer-block.row-content-block
           = service_save_button(@service)
            
-          - if @service.valid? && @service.activated?
-            - unless @service.can_test?
-              - disabled_class = 'disabled'
-              - disabled_title = @service.disabled_title
-
           = link_to 'Cancel', project_settings_integrations_path(@project), class: 'btn btn-cancel'
 - if lookup_context.template_exists?('show', "projects/services/#{@service.to_param}", true)

app/workers/project_export_worker.rb

@@ -4,10 +4,11 @@ class ProjectExportWorker
   sidekiq_options retry: 3
-  def perform(current_user_id, project_id)
+  def perform(current_user_id, project_id, params = {})
+    params = params.with_indifferent_access
     current_user = User.find(current_user_id)
     project = Project.find(project_id)
-    ::Projects::ImportExport::ExportService.new(project, current_user).execute
+    ::Projects::ImportExport::ExportService.new(project, current_user, params).execute
   end
 end

changelogs/unreleased/sh-add-section-name-index.yml → changelogs/unreleased/35475-lazy-diff.yml

 ---
-title: Add index on section_name_id on ci_build_trace_sections table
+title: lazy load diffs on merge request discussions
 merge_request:
 author:
 type: performance

changelogs/unreleased/41902-add-api-option-to-overwrite-project-description-on-project-export.yml

+---
+title: Adds the option to the project export API to override the project description and display GitLab export description once imported
+merge_request: 17744
+author:
+type: added

changelogs/unreleased/43717-breadcrumb-on-admin-runner-page.yml

+---
+title: Set breadcrumb for admin/runners/show
+merge_request: 17431
+author: Takuya Noguchi
+type: fixed

changelogs/unreleased/43720-update-fe-webpack-docs.yml

+---
+title: Update documentation to reflect current minimum required versions of node and
+  yarn
+merge_request: 17706
+author:
+type: other

changelogs/unreleased/43805-list-gitaly-calls-and-arguments-in-the-performance-bar.yml

+---
+title: Add Gitaly call details to performance bar
+merge_request:
+author:
+type: added

changelogs/unreleased/43806-update-ruby-saml-to-1-7-2.yml

+---
+title: Update ruby-saml to 1.7.2 and omniauth-saml to 1.10.0
+merge_request: 17734
+author: Takuya Noguchi
+type: security

changelogs/unreleased/44024-fix-table-extra-column.yml

+---
+title: Fix markdown table showing extra column
+merge_request: 17669
+author:
+type: fixed

changelogs/unreleased/sh-remove-double-caching-repo-empty.yml → changelogs/unreleased/44149-issue-comment-buttons.yml

 ---
-title: Remove double caching of Repository#empty?
+title: Fix broken loading state for close issue button
 merge_request:
 author:
 type: fixed

changelogs/unreleased/44160-update-foreman-to-0-84-0.yml

+---
+title: Update foreman from 0.78.0 to 0.84.0
+merge_request: 17690
+author: Takuya Noguchi
+type: other

changelogs/unreleased/44191-reduce-redis-usage-from-merge-request-diffs-caching.yml

+---
+title: Stop caching highlighted diffs in Redis unnecessarily
+merge_request: 17746
+author:
+type: performance

changelogs/unreleased/44235-update-knapsack-to-1-16-0.yml

+---
+title: Update knapsack to 1.16.0
+merge_request: 17735
+author: Takuya Noguchi
+type: other

changelogs/unreleased/adamco-gitlab-ce-move-issue-command.yml

+---
+title: Add slash command for moving issues
+merge_request:
+author: Adam Pahlevi
+type: added