summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-07 06:06:12 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-07 06:06:12 +0000
commit2a87ae2e368ec6fbb1e75b89bc092ba2fd7eb913 (patch)
tree4d6b995e3292562627ddeeacbc5b5eba0ce64032 /qa
parenteb0d9e20c5a81b0a556308ae3fc8015fcc3c9621 (diff)
downloadgitlab-ce-2a87ae2e368ec6fbb1e75b89bc092ba2fd7eb913.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/page/dashboard/projects.rb4
-rw-r--r--qa/qa/page/project/settings/ci_cd.rb2
2 files changed, 6 insertions, 0 deletions
diff --git a/qa/qa/page/dashboard/projects.rb b/qa/qa/page/dashboard/projects.rb
index 378ac793f7b..c103bc26a36 100644
--- a/qa/qa/page/dashboard/projects.rb
+++ b/qa/qa/page/dashboard/projects.rb
@@ -18,6 +18,10 @@ module QA
'/'
end
+ def clear_project_filter
+ fill_element(:project_filter_form, "")
+ end
+
private
def filter_by_name(name)
diff --git a/qa/qa/page/project/settings/ci_cd.rb b/qa/qa/page/project/settings/ci_cd.rb
index 45040cf4660..46f93fad61e 100644
--- a/qa/qa/page/project/settings/ci_cd.rb
+++ b/qa/qa/page/project/settings/ci_cd.rb
@@ -35,3 +35,5 @@ module QA
end
end
end
+
+QA::Page::Project::Settings::CICD.prepend_if_ee('QA::EE::Page::Project::Settings::CICD')