diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-04-16 18:31:44 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-04-16 18:31:44 +0000 |
| commit | 08083f43cb8ff6b5d83e998fd96159f717aa181f (patch) | |
| tree | 0c78439068beb9090543efd974a2a613a34fa2b0 /qa | |
| parent | 41636097a55bb13aae4cbac6a1fac698a00a6865 (diff) | |
| parent | 5cb0a2ef83ee4618b7dfa4fa90cbc95689246051 (diff) | |
| download | gitlab-ce-08083f43cb8ff6b5d83e998fd96159f717aa181f.tar.gz | |
Merge branch 'refactor/move-mr-widget-ready-to-merge-vue-component' into 'master'
Move ReadyToMerge vue component
See merge request gitlab-org/gitlab-ce!17545
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 |