summaryrefslogtreecommitdiff
path: root/spec/models/concerns
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 06:07:50 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-31 06:07:50 +0000
commit92077e0f8d70c70a908395808b16f98ecd3a5fcd (patch)
treeefb011b2b7e96c2a8a0e7877c0966ab70014ebee /spec/models/concerns
parent83a3209c3f8e5bc055acf80f3440335d2b97133b (diff)
downloadgitlab-ce-92077e0f8d70c70a908395808b16f98ecd3a5fcd.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/concerns')
-rw-r--r--spec/models/concerns/prometheus_adapter_spec.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/models/concerns/prometheus_adapter_spec.rb b/spec/models/concerns/prometheus_adapter_spec.rb
index 3ac96b308ed..bc58df7e7c2 100644
--- a/spec/models/concerns/prometheus_adapter_spec.rb
+++ b/spec/models/concerns/prometheus_adapter_spec.rb
@@ -131,7 +131,6 @@ describe PrometheusAdapter, :use_clean_rails_memory_store_caching do
end
it { expect(subject.to_json).to eq(prometheus_data.to_json) }
- it { expect(subject.to_json).to eq(prometheus_data.to_json) }
end
[404, 500].each do |status|