summaryrefslogtreecommitdiff
path: root/qa/qa/page/project/settings/merge_request.rb
diff options
context:
space:
mode:
Diffstat (limited to 'qa/qa/page/project/settings/merge_request.rb')
-rw-r--r--qa/qa/page/project/settings/merge_request.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/qa/page/project/settings/merge_request.rb b/qa/qa/page/project/settings/merge_request.rb
index b147c91b467..a88cd661016 100644
--- a/qa/qa/page/project/settings/merge_request.rb
+++ b/qa/qa/page/project/settings/merge_request.rb
@@ -5,7 +5,7 @@ module QA
class MergeRequest < QA::Page::Base
include Common
- view 'app/views/projects/_merge_request_fast_forward_settings.html.haml' do
+ view 'app/views/projects/_merge_request_merge_method_settings.html.haml' do
element :radio_button_merge_ff
end