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:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-27 03:09:34 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-27 03:09:34 +0300
commit5a80b10a845c1df6d73804090265a3da67c6acc4 (patch)
treea0cc9c6a4e5307c37b1b7ad51c186d7351a8b788 /spec/lib/gitlab/metrics_spec.rb
parenta8324cd026394f672b0ae482aef0f5007fe1db8e (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/metrics_spec.rb')
-rw-r--r--spec/lib/gitlab/metrics_spec.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/spec/lib/gitlab/metrics_spec.rb b/spec/lib/gitlab/metrics_spec.rb
index db5a23e2328..e83adf5bf67 100644
--- a/spec/lib/gitlab/metrics_spec.rb
+++ b/spec/lib/gitlab/metrics_spec.rb
@@ -54,6 +54,11 @@ RSpec.describe Gitlab::Metrics do
end
describe '.measure' do
+ before do
+ skip_feature_flags_yaml_validation
+ skip_default_enabled_yaml_check
+ end
+
context 'without a transaction' do
it 'returns the return value of the block' do
val = described_class.measure(:foo) { 10 }