diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-12-13 09:36:50 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-12-13 09:36:50 +0000 |
commit | 011ffcfd30b07b7d5c31876a66059c9467ca4147 (patch) | |
tree | a46f333ab6676a1189d568b46314bfb75573f7a2 /qa/qa.rb | |
parent | 3c19c971df0490772494e224405f13a0f98d6bf4 (diff) | |
parent | eacf99aff7a71d11b42f22c2e9399d1550052853 (diff) | |
download | gitlab-ce-011ffcfd30b07b7d5c31876a66059c9467ca4147.tar.gz |
Merge branch 'master' into 38869-datetime
* master: (85 commits)
Export old code into es6 modules
Use relative URL for projects to avoid storing domains
Fix spec by avoiding monkeypatching
Return the noteable in Note#touch_noteable
add CHANGELOG.md entry for !15889
fix broken empty state assets for environment monitoring page
removed tab indexes from tag form
Refactor entrypoint override docs
Present member collection at the controller level
Adds i18n
check the import_status field before doing SQL operations to check the import url
Fix rubocop offence
Fix entrypoint overriding documentation
Remove unnecessary js-issuable-edit
Use memoization for commits on diffs
Move Repository#write_ref to Git::Repository#write_ref
Treat empty markdown and html strings as valid cached text, not missing cache that needs to be updated
Center cluster title
Remove noisy notification from QA base page
Remove unused page from hashed storage QA scenario
...
Diffstat (limited to 'qa/qa.rb')
-rw-r--r-- | qa/qa.rb | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -9,6 +9,7 @@ module QA autoload :User, 'qa/runtime/user' autoload :Namespace, 'qa/runtime/namespace' autoload :Scenario, 'qa/runtime/scenario' + autoload :Browser, 'qa/runtime/browser' end ## @@ -69,7 +70,6 @@ module QA autoload :Base, 'qa/page/base' module Main - autoload :Entry, 'qa/page/main/entry' autoload :Login, 'qa/page/main/login' autoload :Menu, 'qa/page/main/menu' autoload :OAuth, 'qa/page/main/oauth' |