Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2018-09-10 21:01:49 +0300
committerJan Provaznik <jprovaznik@gitlab.com>2018-09-12 11:13:19 +0300
commit9930ab6ab8dcdf3cbdeaaae441b9c2f0e345c15a (patch)
tree06ace794f0f067b4c8f1ef4388ef492518d7b856
parenta3c3776b5c7fd5c3c6c7bc9ee846b4d105333b32 (diff)
Remove peek-sidekiq
The reason for removing this gem is that it's not being maintained anymore. It uses `alias_method_chain` which is deprecated in rails 5 (and removed in 5.1), the issue is pending upstream (including a fix) - https://github.com/suranyami/peek-sidekiq/issues/3 for a while. Peek-sidekiq is used in performance bar for displaying sidekiq statistics.
-rw-r--r--Gemfile1
-rw-r--r--Gemfile.lock5
-rw-r--r--Gemfile.rails5.lock5
-rw-r--r--changelogs/unreleased/remove-sidekiq.yml5
-rw-r--r--config/initializers/peek.rb1
5 files changed, 5 insertions, 12 deletions
diff --git a/Gemfile b/Gemfile
index 27e6ba21ff3..106ae35efa4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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 8c545b7257c..201f1492d27 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