Automatic merge of gitlab-org/gitlab-ce master

doc/integration/omniauth.md

@@ -277,6 +277,7 @@ omniauth:
   sync_profile_from_provider: ['twitter', 'google_oauth2']
   sync_profile_attributes: ['email', 'location']
 ```
+
 ## Bypassing two factor authentication
 
 Starting with GitLab 12.3, this allows users to login with the specified

qa/qa/specs/features/browser_ui/3_create/repository/add_file_template_spec.rb

 # frozen_string_literal: true
 
 module QA
-  # Failure issue: https://gitlab.com/gitlab-org/quality/nightly/issues/127
-  context 'Create', :quarantine do
+  context 'Create' do
     describe 'File templates' do
       include Runtime::Fixtures
 

qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb

 # frozen_string_literal: true
 
 module QA
-  context 'Create', :quarantine do
-    # Failure issue: https://gitlab.com/gitlab-org/quality/nightly/issues/127
+  context 'Create' do
     describe 'Web IDE file templates' do
       include Runtime::Fixtures