diff options
author | micael.bergeron <micaelbergeron@gmail.com> | 2017-11-06 09:03:11 -0500 |
---|---|---|
committer | micael.bergeron <micaelbergeron@gmail.com> | 2017-11-06 09:03:11 -0500 |
commit | bb0543ef4782febe4dd0f26fc8a476b743fb86ca (patch) | |
tree | 9320fd05f6c1eb2f57cdd6fc65493a9366dce17d /spec/requests | |
parent | 6c1c64d4bb36099fa4876db309b5f8873650e909 (diff) | |
download | gitlab-ce-bb0543ef4782febe4dd0f26fc8a476b743fb86ca.tar.gz |
ignore the column before the migration
reword the changelog
remove dead code in the specs
Diffstat (limited to 'spec/requests')
-rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/v3/merge_requests_spec.rb | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index 024cfe8b372..e16be3c46e1 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -623,8 +623,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 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 |