summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-14 19:58:16 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-14 19:58:16 +0300
commit48e5dff99c5ae206019082295357f513e412671e (patch)
treeb3e3cc664683c03ed5c1d9741cea5c224366940b
parent940c05086ee595fd5ea7f77a07b78bff14efb7e2 (diff)
downloadgitlab-ce-48e5dff99c5ae206019082295357f513e412671e.tar.gz
Fix MR feature
-rw-r--r--features/steps/project/project_merge_requests.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/project/project_merge_requests.rb b/features/steps/project/project_merge_requests.rb
index 6a2f870e276..ea434412bb2 100644
--- a/features/steps/project/project_merge_requests.rb
+++ b/features/steps/project/project_merge_requests.rb
@@ -57,8 +57,8 @@ class ProjectMergeRequests < Spinach::FeatureSteps
And 'I submit new merge request "Wiki Feature"' do
fill_in "merge_request_title", with: "Wiki Feature"
- select "master", from: "merge_request_source_branch"
- select "stable", from: "merge_request_target_branch"
+ select "bootstrap", from: "merge_request_source_branch"
+ select "master", from: "merge_request_target_branch"
click_button "Submit merge request"
end