summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-09-26 14:48:03 +0000
committerPhil Hughes <me@iamphill.com>2018-09-26 14:48:03 +0000
commitc052f5a942152982124315791aad10da5fec11d5 (patch)
tree945cf6de05dc0b7300a22a696d0bc05054b88629 /qa
parenta1529944e962fc9b4addee324b4e606c4b7b1e93 (diff)
parentaa5d83d4c3511f296295dbb9d4a489f0846efea0 (diff)
downloadgitlab-ce-c052f5a942152982124315791aad10da5fec11d5.tar.gz
Merge branch 'rename-squash-before-merge-vue-component' into 'master'
Rename squash before merge vue component See merge request gitlab-org/gitlab-ce!21851
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/page/merge_request/show.rb2
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 befb7c1809a..d9254d89541 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -19,7 +19,7 @@ module QA
element :no_fast_forward_message, 'Fast-forward merge is not possible'
end
- view 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_squash_before_merge.vue' do
+ view 'app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue' do
element :squash_checkbox
end