summaryrefslogtreecommitdiff
path: root/qa/qa.rb
diff options
context:
space:
mode:
authorDylan Griffith <dyl.griffith@gmail.com>2018-04-24 15:07:34 +1000
committerDylan Griffith <dyl.griffith@gmail.com>2018-04-24 15:07:34 +1000
commit1b9c1ac3adb3d65e51f38e37c4705d46c5618f88 (patch)
treeb724afd0596dd658f7ef7baddf9411ff3e599f7d /qa/qa.rb
parent392c411bdc16386ef42c86afaf8c4d8e4cddb955 (diff)
parent2e00c1a72afc4b7388bb46bd6d58608e2ae61899 (diff)
downloadgitlab-ce-1b9c1ac3adb3d65e51f38e37c4705d46c5618f88.tar.gz
Merge branch 'master' into 10244-add-project-ci-cd-settings
Diffstat (limited to 'qa/qa.rb')
-rw-r--r--qa/qa.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/qa/qa.rb b/qa/qa.rb
index 56a99c32b26..fff99a1d31b 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -31,6 +31,7 @@ module QA
autoload :Project, 'qa/factory/resource/project'
autoload :MergeRequest, 'qa/factory/resource/merge_request'
autoload :DeployKey, 'qa/factory/resource/deploy_key'
+ autoload :Branch, 'qa/factory/resource/branch'
autoload :SecretVariable, 'qa/factory/resource/secret_variable'
autoload :Runner, 'qa/factory/resource/runner'
autoload :PersonalAccessToken, 'qa/factory/resource/personal_access_token'
@@ -132,6 +133,7 @@ module QA
autoload :Repository, 'qa/page/project/settings/repository'
autoload :CICD, 'qa/page/project/settings/ci_cd'
autoload :DeployKeys, 'qa/page/project/settings/deploy_keys'
+ autoload :ProtectedBranches, 'qa/page/project/settings/protected_branches'
autoload :SecretVariables, 'qa/page/project/settings/secret_variables'
autoload :Runners, 'qa/page/project/settings/runners'
autoload :MergeRequest, 'qa/page/project/settings/merge_request'