summaryrefslogtreecommitdiff
path: root/spec/requests/api/v3
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-11-07 22:12:19 +0900
committerShinya Maeda <shinya@gitlab.com>2017-11-07 22:12:19 +0900
commitd89c18901bde510da2668e676b3bf2f1e21deef2 (patch)
tree57ddcc05bb1ca0d70bfb827d0e1ef4930c7ebf7b /spec/requests/api/v3
parentafef38533727cf32a7be324243a25b4db5eb5498 (diff)
parent666ab4882f2c6d385c04afe269ddf5b11f795b19 (diff)
downloadgitlab-ce-d89c18901bde510da2668e676b3bf2f1e21deef2.tar.gz
Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-new
Diffstat (limited to 'spec/requests/api/v3')
-rw-r--r--spec/requests/api/v3/merge_requests_spec.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/requests/api/v3/merge_requests_spec.rb b/spec/requests/api/v3/merge_requests_spec.rb
index 26251b95680..91897e5ee01 100644
--- a/spec/requests/api/v3/merge_requests_spec.rb
+++ b/spec/requests/api/v3/merge_requests_spec.rb
@@ -319,8 +319,6 @@ describe API::MergeRequests do
before do
forked_project.add_reporter(user2)
-
- allow_any_instance_of(MergeRequest).to receive(:write_ref)
end
it "returns merge_request" do