diff options
| author | Lukas Eipert <leipert@gitlab.com> | 2018-05-31 11:44:32 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-31 11:44:32 +0300 |
| commit | 234f176d62bf1b1919562f2a7939a260fa8d11a1 (patch) | |
| tree | f510ad59e332d8ecb0d7df99902b14a97669876f /qa | |
| parent | ec1d3e104afddf7c8a5f6f5d8bf1ffee99a8f551 (diff) | |
Cleanup code for General Project Settings
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/page/project/settings/merge_request.rb | 2 |
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 |