summaryrefslogtreecommitdiff
path: root/qa/qa.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2018-04-17 20:55:47 +0800
committerLin Jen-Shin <godfat@godfat.org>2018-04-17 20:55:47 +0800
commit8d4ad0c7dbd5081a73af06d71d5dde9a7f3d3400 (patch)
treeb2fb9d0cd88e0a2d46e05c37e00fd5069efe273c /qa/qa.rb
parent61b4c157444ea0b9e60f44959630db42e21067ad (diff)
parentbcd89dcd1f49c50a5c1c659bed5cbb6899574464 (diff)
downloadgitlab-ce-8d4ad0c7dbd5081a73af06d71d5dde9a7f3d3400.tar.gz
Merge remote-tracking branch 'upstream/master' into qa-add-more-key-tests
* upstream/master: (536 commits) Fix flash errors in performance bar for cached responses Force content to align right Method to track recoverable exceptions in sentry Move PipelineFailed vue component fixed targetmode being included in project FE Docs: Fix header hierarchy in Vuex section of Vue.md Adds helpers to remove withespace and linebreaks `package-qa` was renamed to `package-and-qa` Fix container scanning in vendored GitLab CI configuration for Auto Devops Fixed web IDE not working for sub-groups Remove web ide beta flag from docs and update Make the message break into a new line instead of truncating it Backport Web IDE docs to gitlab-ce link to product handbook piece on permissions Update faraday_middlewar to 0.12.2 Double-check next value for internal ids. Resolve "skeleton placeholder on diff has white background" Replace the `project/commits/comments.feature` spinach test with an rspec analog Set ENV['IN_MEMORY_APPLICATION_SETTINGS'] to 'true in spec/db/production/settings_spec.rb Update docs on `.gitlab-ci.yml` and variables policy ...
Diffstat (limited to 'qa/qa.rb')
-rw-r--r--qa/qa.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/qa/qa.rb b/qa/qa.rb
index 5fb9364a6ab..48dfc93dd62 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -96,6 +96,10 @@ module QA
autoload :OAuth, 'qa/page/main/oauth'
end
+ module Settings
+ autoload :Common, 'qa/page/settings/common'
+ end
+
module Menu
autoload :Main, 'qa/page/menu/main'
autoload :Side, 'qa/page/menu/side'
@@ -156,7 +160,10 @@ module QA
end
module Admin
- autoload :Settings, 'qa/page/admin/settings'
+ module Settings
+ autoload :RepositoryStorage, 'qa/page/admin/settings/repository_storage'
+ autoload :Main, 'qa/page/admin/settings/main'
+ end
end
module Mattermost