Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-15

# Conflicts:
#	.gitlab-ci.yml

[ci skip]

.gitlab-ci.yml

@@ -33,11 +33,14 @@ variables:
   KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json
   FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/report-suite.json
   BUILD_ASSETS_IMAGE: "false"
+<<<<<<< HEAD
   ## EE specific variables ##
   # This hack is needed to make ES not that memory hungry
   ES_JAVA_OPTS: "-Xms256m -Xmx256m"
   ELASTIC_URL: "http://elastic:changeme@docker.elastic.co-elasticsearch-elasticsearch:9200"
   EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master-ee.json
+=======
+>>>>>>> upstream/master
 
 before_script:
   - bundle --version

GITALY_SERVER_VERSION

-0.129.0
+0.132.0

app/assets/javascripts/jobs/store/getters.js

@@ -42,7 +42,7 @@ export const emptyStateIllustration = state =>
   (state.job && state.job.status && state.job.status.illustration) || {};
 
 export const emptyStateAction = state =>
-  (state.job && state.job.status && state.job.status.action) || {};
+  (state.job && state.job.status && state.job.status.action) || null;
 
 // ee-only start
 /**

app/controllers/admin/background_jobs_controller.rb

 # frozen_string_literal: true
 
 class Admin::BackgroundJobsController < Admin::ApplicationController
-  def show
-    ps_output, _ = Gitlab::Popen.popen(%W(ps ww -U #{Gitlab.config.gitlab.user} -o pid,pcpu,pmem,stat,start,command))
-    @sidekiq_processes = ps_output.split("\n").grep(/sidekiq \d+\.\d+\.\d+/)
-    @concurrency = Sidekiq.options[:concurrency]
-  end
 end

app/views/admin/background_jobs/show.html.haml

@@ -6,43 +6,5 @@
   %p.light GitLab uses #{link_to "sidekiq", "http://sidekiq.org/"} library for async job processing
 
   %hr
-
-  .card
-    .card-header Sidekiq running processes
-    .card-body
-      - if @sidekiq_processes.empty?
-        %h4.cred
-          %i.fa.fa-exclamation-triangle
-          There are no running sidekiq processes. Please restart GitLab
-      - else
-        .table-holder
-          %table.table
-            %thead
-              %th USER
-              %th PID
-              %th CPU
-              %th MEM
-              %th STATE
-              %th START
-              %th COMMAND
-            %tbody
-              - @sidekiq_processes.each do |process|
-                %tr
-                  %td= gitlab_config.user
-                  - parse_sidekiq_ps(process).each do |value|
-                    %td= value
-        .clearfix
-          %p
-            %i.fa.fa-exclamation-circle
-            If '[#{@concurrency} of #{@concurrency} busy]' is shown, restart GitLab.
-            = link_to sprite_icon('question', size: 16), help_page_path('administration/restart_gitlab')
-
-          %p
-            %i.fa.fa-exclamation-circle
-            If more than one sidekiq process is listed, stop GitLab, kill the remaining sidekiq processes (sudo pkill -u #{gitlab_config.user} -f sidekiq) and restart GitLab.
-            = link_to sprite_icon('question', size: 16), help_page_path('administration/restart_gitlab')
-
-
-
   .card
     %iframe{ src: sidekiq_path, width: '100%', height: 970, style: "border: 0" }

changelogs/unreleased/54021-empty-button.yml

+---
+title: Prevent empty button being rendered in empty state
+merge_request:
+author:
+type: fixed

changelogs/unreleased/gt-remove-unused-project-method.yml

+---
+title: Remove unused project method
+merge_request: 54103
+author: George Tsiolis
+type: other

changelogs/unreleased/sh-remove-local-sidekiq-admin-check.yml

+---
+title: Remove display of local Sidekiq process in /admin/sidekiq
+merge_request: 23118
+author:
+type: fixed

spec/javascripts/jobs/components/empty_state_spec.js

@@ -84,6 +84,7 @@ describe('Empty State', () => {
       vm = mountComponent(Component, {
         ...props,
         content,
+        action: null,
       });
 
       expect(vm.$el.querySelector('.js-job-empty-state-action')).toBeNull();