diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-09 15:30:57 +0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-11-14 19:07:29 +0300 |
| commit | 19d6cdfe1b374fce6119a85a6e221d9e354dc0e3 (patch) | |
| tree | 09f25ff1c9199bf01c6a5e7e07a8a005ce991280 /app | |
| parent | dd0e4f30b3bf71dfd8561410f9bcc7213d7c6ca0 (diff) | |
Merge branch '39958-updatemergerequestsworker-are-failing-on-metric-tagging' into 'master'
Revert "add metrics tagging to the sidekiq middleware"
Closes #39958
See merge request gitlab-org/gitlab-ce!15285
(cherry picked from commit 43d98cd1ff3ea0dd6a794ba4d1d621415d439985)
7fd3ce41 Revert "add metrics tagging to the sidekiq middleware"
Diffstat (limited to 'app')
| -rw-r--r-- | app/workers/update_merge_requests_worker.rb | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/app/workers/update_merge_requests_worker.rb b/app/workers/update_merge_requests_worker.rb index 150788ca611..89ae17cef37 100644 --- a/app/workers/update_merge_requests_worker.rb +++ b/app/workers/update_merge_requests_worker.rb @@ -2,10 +2,6 @@ class UpdateMergeRequestsWorker include Sidekiq::Worker include DedicatedSidekiqQueue - def metrics_tags - @metrics_tags || {} - end - def perform(project_id, user_id, oldrev, newrev, ref) project = Project.find_by(id: project_id) return unless project @@ -13,11 +9,6 @@ class UpdateMergeRequestsWorker user = User.find_by(id: user_id) return unless user - @metrics_tags = { - project_id: project_id, - user_id: user_id - } - MergeRequests::RefreshService.new(project, user).execute(oldrev, newrev, ref) end end |