summaryrefslogtreecommitdiff
path: root/qa/qa.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2018-01-26 17:25:48 +0800
committerLin Jen-Shin <godfat@godfat.org>2018-01-26 17:25:48 +0800
commitb54beca7ab3bdf47a3b44be70d7986a3870a794c (patch)
tree04152ebcc326f5cd97db60cb5842814ce549b882 /qa/qa.rb
parenta33f7050be76c158dfd749dcf4e5856bad7acf46 (diff)
parentb8d044af88507b300d98d9141a2a3d7735f0696d (diff)
downloadgitlab-ce-b54beca7ab3bdf47a3b44be70d7986a3870a794c.tar.gz
Merge remote-tracking branch 'upstream/master' into qa/ee-4698-backport
* upstream/master: Just don't expand if it's already expanded fix bug in webpack_helper in which force_same_domain argument was ignored breaking local rspec tests Fix rubocop offenses introduced in !16623 Prefer local variables over given/let Try to restore page's state Add more views check Respect the latest changes from master Add a scenario for adding secret variables
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 69f4dc86d83..deac77036c5 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -29,6 +29,7 @@ module QA
autoload :Group, 'qa/factory/resource/group'
autoload :Project, 'qa/factory/resource/project'
autoload :DeployKey, 'qa/factory/resource/deploy_key'
+ autoload :SecretVariable, 'qa/factory/resource/secret_variable'
autoload :Runner, 'qa/factory/resource/runner'
autoload :PersonalAccessToken, 'qa/factory/resource/personal_access_token'
end
@@ -119,6 +120,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 :SecretVariables, 'qa/page/project/settings/secret_variables'
autoload :Runners, 'qa/page/project/settings/runners'
end
end