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
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/qa/spec/page/validator_spec.rb b/qa/spec/page/validator_spec.rb
index 02822d7d18f..55957649904 100644
--- a/qa/spec/page/validator_spec.rb
+++ b/qa/spec/page/validator_spec.rb
@@ -30,7 +30,7 @@ describe QA::Page::Validator do
     let(:view) { spy('view') }
 
     before do
-      allow(QA::Page::Admin::Settings)
+      allow(QA::Page::Admin::Settings::Main)
         .to receive(:views).and_return([view])
     end