summaryrefslogtreecommitdiff
path: root/spec/fixtures
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-06 21:07:59 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-06 21:07:59 +0000
commit1c25ac983cd1e4335faa1ec4922c314d6321e224 (patch)
tree68d88ab5d9ed5c3397e52fe85fc38ab237335a91 /spec/fixtures
parent83731155d997ae24c7e0cd5ffa6f0dba41bec6dc (diff)
downloadgitlab-ce-1c25ac983cd1e4335faa1ec4922c314d6321e224.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/fixtures')
-rw-r--r--spec/fixtures/trace/sample_trace2
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/fixtures/trace/sample_trace b/spec/fixtures/trace/sample_trace
index f768c038f9e..e76712782be 100644
--- a/spec/fixtures/trace/sample_trace
+++ b/spec/fixtures/trace/sample_trace
@@ -2772,8 +2772,6 @@ Service
should return false by default
#deprecation_message
should be empty by default
- .find_by_template
- returns service template
#api_field_names
filters out sensitive fields