Merge branch 'master' into qa/gb/selenium-handle-domain-sessions

* master: (694 commits)

Conflicts:
	qa/qa/page/base.rb
	qa/qa/page/main/entry.rb

1 files changed, 14 insertions, 0 deletions

diff --git a/qa/qa.rb b/qa/qa.rb
index 3089e515082..4ffa01ad06d 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -50,6 +50,10 @@ module QA
       module Sandbox
         autoload :Prepare, 'qa/scenario/gitlab/sandbox/prepare'
       end
+
+      module Admin
+        autoload :HashedStorage, 'qa/scenario/gitlab/admin/hashed_storage'
+      end
     end
   end
 
@@ -64,9 +68,11 @@ module QA
     module Main
       autoload :Login, 'qa/page/main/login'
       autoload :Menu, 'qa/page/main/menu'
+      autoload :OAuth, 'qa/page/main/oauth'
     end
 
     module Dashboard
+      autoload :Projects, 'qa/page/dashboard/projects'
       autoload :Groups, 'qa/page/dashboard/groups'
     end
 
@@ -82,6 +88,7 @@ module QA
 
     module Admin
       autoload :Menu, 'qa/page/admin/menu'
+      autoload :Settings, 'qa/page/admin/settings'
     end
 
     module Mattermost
@@ -98,6 +105,13 @@ module QA
   end
 
   ##
+  # Classes describing shell interaction with GitLab
+  #
+  module Shell
+    autoload :Omnibus, 'qa/shell/omnibus'
+  end
+
+  ##
   # Classes that make it possible to execute features tests.
   #
   module Specs