diff options
| author | George Tsiolis <tsiolis.g@gmail.com> | 2018-03-06 00:24:16 +0200 |
|---|---|---|
| committer | George Tsiolis <tsiolis.g@gmail.com> | 2018-03-30 12:15:17 +0300 |
| commit | 5cb0a2ef83ee4618b7dfa4fa90cbc95689246051 (patch) | |
| tree | dc0057dfe28136ee2b8273942a6d458a2ff0e32a /qa | |
| parent | 85418f9ae8df980ce518247deddded23c16bbc7f (diff) | |
| download | gitlab-ce-5cb0a2ef83ee4618b7dfa4fa90cbc95689246051.tar.gz | |
Move ReadyToMerge vue component
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/page/merge_request/show.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb index 2f2506f08fb..166861e6c4a 100644 --- a/qa/qa/page/merge_request/show.rb +++ b/qa/qa/page/merge_request/show.rb @@ -2,7 +2,7 @@ module QA module Page module MergeRequest class Show < Page::Base - view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_ready_to_merge.js' do + view 'app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue' do element :merge_button element :fast_forward_message, 'Fast-forward merge without a merge commit' end |