summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/merge_requests_controller_spec.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-02-02 15:17:50 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-02-02 15:17:50 +0000
commit65c71039ebe065a6c97e226f5743bd637680a14e (patch)
treea0c7a9d7f1fd65f290318cc7465cd3d07354a908 /spec/controllers/projects/merge_requests_controller_spec.rb
parent292384904c9d821acca2f92d2de2f0b2ed5216df (diff)
downloadgitlab-ce-65c71039ebe065a6c97e226f5743bd637680a14e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
-rw-r--r--spec/controllers/projects/merge_requests_controller_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index 3ac59d8e43a..88e60a5352a 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -443,7 +443,7 @@ RSpec.describe Projects::MergeRequestsController do
context 'when the merge request is not mergeable' do
before do
- merge_request.update!(title: "WIP: #{merge_request.title}")
+ merge_request.update!(title: "Draft: #{merge_request.title}")
post :merge, params: base_params
end