Commit 7628792d authored by GitLab Bot's avatar GitLab Bot

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

# Conflicts:
#	.gitlab-ci.yml

[ci skip]
parents 9f635422 97e3d5ce
...@@ -33,11 +33,14 @@ variables: ...@@ -33,11 +33,14 @@ variables:
KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master.json
FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/report-suite.json FLAKY_RSPEC_SUITE_REPORT_PATH: rspec_flaky/report-suite.json
BUILD_ASSETS_IMAGE: "false" BUILD_ASSETS_IMAGE: "false"
<<<<<<< HEAD
## EE specific variables ## ## EE specific variables ##
# This hack is needed to make ES not that memory hungry # This hack is needed to make ES not that memory hungry
ES_JAVA_OPTS: "-Xms256m -Xmx256m" ES_JAVA_OPTS: "-Xms256m -Xmx256m"
ELASTIC_URL: "http://elastic:changeme@docker.elastic.co-elasticsearch-elasticsearch:9200" 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 EE_KNAPSACK_RSPEC_SUITE_REPORT_PATH: knapsack/${CI_PROJECT_NAME}/rspec_report-master-ee.json
=======
>>>>>>> upstream/master
before_script: before_script:
- bundle --version - bundle --version
......
...@@ -42,7 +42,7 @@ export const emptyStateIllustration = state => ...@@ -42,7 +42,7 @@ export const emptyStateIllustration = state =>
(state.job && state.job.status && state.job.status.illustration) || {}; (state.job && state.job.status && state.job.status.illustration) || {};
export const emptyStateAction = state => 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 // ee-only start
/** /**
......
# frozen_string_literal: true # frozen_string_literal: true
class Admin::BackgroundJobsController < Admin::ApplicationController 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 end
...@@ -6,43 +6,5 @@ ...@@ -6,43 +6,5 @@
%p.light GitLab uses #{link_to "sidekiq", "http://sidekiq.org/"} library for async job processing %p.light GitLab uses #{link_to "sidekiq", "http://sidekiq.org/"} library for async job processing
%hr %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 .card
%iframe{ src: sidekiq_path, width: '100%', height: 970, style: "border: 0" } %iframe{ src: sidekiq_path, width: '100%', height: 970, style: "border: 0" }
---
title: Prevent empty button being rendered in empty state
merge_request:
author:
type: fixed
---
title: Remove unused project method
merge_request: 54103
author: George Tsiolis
type: other
---
title: Remove display of local Sidekiq process in /admin/sidekiq
merge_request: 23118
author:
type: fixed
...@@ -84,6 +84,7 @@ describe('Empty State', () => { ...@@ -84,6 +84,7 @@ describe('Empty State', () => {
vm = mountComponent(Component, { vm = mountComponent(Component, {
...props, ...props,
content, content,
action: null,
}); });
expect(vm.$el.querySelector('.js-job-empty-state-action')).toBeNull(); expect(vm.$el.querySelector('.js-job-empty-state-action')).toBeNull();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment