diff options
author | Robert Speicher <robert@gitlab.com> | 2018-09-14 16:06:10 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-09-14 16:06:10 +0000 |
commit | 99612476e576881e57512a44fbb8e5e040c425b0 (patch) | |
tree | f0839f86e1c2053dba7927e65f821b4ef47e02d2 | |
parent | 877c88897ee6f72b81a76e9abfc32f1d1fdb61b6 (diff) | |
parent | 9930ab6ab8dcdf3cbdeaaae441b9c2f0e345c15a (diff) | |
download | gitlab-ce-99612476e576881e57512a44fbb8e5e040c425b0.tar.gz |
Merge branch 'remove-sidekiq' into 'master'
Remove peek-sidekiq
Closes #51407
See merge request gitlab-org/gitlab-ce!21693
-rw-r--r-- | Gemfile | 1 | ||||
-rw-r--r-- | Gemfile.lock | 5 | ||||
-rw-r--r-- | Gemfile.rails5.lock | 5 | ||||
-rw-r--r-- | changelogs/unreleased/remove-sidekiq.yml | 5 | ||||
-rw-r--r-- | config/initializers/peek.rb | 1 |
5 files changed, 5 insertions, 12 deletions
@@ -300,7 +300,6 @@ gem 'peek-mysql2', '~> 1.1.0', group: :mysql gem 'peek-pg', '~> 1.3.0', group: :postgres gem 'peek-rblineprof', '~> 0.2.0' gem 'peek-redis', '~> 1.2.0' -gem 'peek-sidekiq', '~> 1.0.3' # Metrics group :metrics do diff --git a/Gemfile.lock b/Gemfile.lock index 0832fe25711..328cc55cb8c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -605,10 +605,6 @@ GEM atomic (>= 1.0.0) peek redis - peek-sidekiq (1.0.3) - atomic (>= 1.0.0) - peek - sidekiq pg (0.18.4) po_to_json (1.0.1) json (>= 1.6.0) @@ -1113,7 +1109,6 @@ DEPENDENCIES peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) - peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index b384592d035..48b1190fd56 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -609,10 +609,6 @@ GEM atomic (>= 1.0.0) peek redis - peek-sidekiq (1.0.3) - atomic (>= 1.0.0) - peek - sidekiq pg (0.18.4) po_to_json (1.0.1) json (>= 1.6.0) @@ -1122,7 +1118,6 @@ DEPENDENCIES peek-pg (~> 1.3.0) peek-rblineprof (~> 0.2.0) peek-redis (~> 1.2.0) - peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) prometheus-client-mmap (~> 0.9.4) diff --git a/changelogs/unreleased/remove-sidekiq.yml b/changelogs/unreleased/remove-sidekiq.yml new file mode 100644 index 00000000000..c7bef974b89 --- /dev/null +++ b/changelogs/unreleased/remove-sidekiq.yml @@ -0,0 +1,5 @@ +--- +title: Remove sidekiq info from performance bar +merge_request: +author: +type: removed diff --git a/config/initializers/peek.rb b/config/initializers/peek.rb index bc9b52ceef7..a6f43415ec5 100644 --- a/config/initializers/peek.rb +++ b/config/initializers/peek.rb @@ -18,7 +18,6 @@ Peek.into PEEK_DB_VIEW Peek.into Peek::Views::Gitaly Peek.into Peek::Views::Rblineprof Peek.into Peek::Views::Redis -Peek.into Peek::Views::Sidekiq Peek.into Peek::Views::GC # rubocop:disable Naming/ClassAndModuleCamelCase |