summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-11-08 08:14:20 +0000
committerStan Hu <stanhu@gmail.com>2017-11-08 08:14:20 +0000
commitcb606c5a79039706016c7537c8e72645b3668592 (patch)
tree847e1a42eb5c8d9ab34e2aab8d7e5236d38084b7 /lib
parenta979153b6469d328622e8d7ad2b286c6330e1520 (diff)
parent90edcb45cda088927f4af378c0aa0e7d7004f582 (diff)
downloadgitlab-ce-cb606c5a79039706016c7537c8e72645b3668592.tar.gz
Merge branch 'pawel/fix_backend_transaction_protected_labels_method' into 'master'
Make BackgroundTransaction#labels public See merge request gitlab-org/gitlab-ce!15257
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/metrics/background_transaction.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/gitlab/metrics/background_transaction.rb b/lib/gitlab/metrics/background_transaction.rb
index d01de5eef0a..5919ebb1493 100644
--- a/lib/gitlab/metrics/background_transaction.rb
+++ b/lib/gitlab/metrics/background_transaction.rb
@@ -6,8 +6,6 @@ module Gitlab
@worker_class = worker_class
end
- protected
-
def labels
{ controller: @worker_class.name, action: 'perform' }
end