summaryrefslogtreecommitdiff
path: root/qa/qa/page/merge_request
diff options
context:
space:
mode:
authorYorick Peterse <yorick@yorickpeterse.com>2019-08-28 17:43:45 +0200
committerYorick Peterse <yorick@yorickpeterse.com>2019-08-29 14:56:40 +0200
commite84398ba641466cc137fde668984f27f13e9b100 (patch)
tree1905a9c12c7cdee03622179587b7923f4357066f /qa/qa/page/merge_request
parent5445f71e608b7dd5dac068006a578b32fabdf6ac (diff)
downloadgitlab-ce-e84398ba641466cc137fde668984f27f13e9b100.tar.gz
Backport EE changes to the qa/ directoryresolve-new-qa-differences
Now that the qa/ directory uses the X_if_ee methods we can backport all these lines to CE.
Diffstat (limited to 'qa/qa/page/merge_request')
-rw-r--r--qa/qa/page/merge_request/show.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/qa/qa/page/merge_request/show.rb b/qa/qa/page/merge_request/show.rb
index 6a415b56e50..72f8e1c3ef0 100644
--- a/qa/qa/page/merge_request/show.rb
+++ b/qa/qa/page/merge_request/show.rb
@@ -187,3 +187,5 @@ module QA
end
end
end
+
+QA::Page::MergeRequest::Show.prepend_if_ee('QA::EE::Page::MergeRequest::Show')