Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-06

# Conflicts:
#	qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb

[ci skip]

qa/qa/specs/features/browser_ui/1_manage/login/register_spec.rb

@@ -5,7 +5,11 @@ module QA
     it 'user registers and logs in' do
       Runtime::Browser.visit(:gitlab, Page::Main::Login)
 
+<<<<<<< HEAD
       Resource::User.fabricate_via_browser_ui!
+=======
+      Resource::User.fabricate!
+>>>>>>> upstream/master
 
       # TODO, since `Signed in successfully` message was removed
       # this is the only way to tell if user is signed in correctly.