diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 00:07:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 00:07:48 +0300 |
| commit | e98d69bc8b8b926a727d36e37d2ee30c9fa28907 (patch) | |
| tree | 1e86398c19b6ddd0602a99fb449cf75652ac62cf /qa | |
| parent | 007aba8b3b5583c5ef31670369f32f9f1f72555d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb | 2 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb b/qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb index 7c9db5ee496..70b571a316a 100644 --- a/qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/web_ide/add_file_template_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module QA - context 'Create' do + context 'Create', quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/196034' do describe 'Web IDE file templates' do include Runtime::Fixtures diff --git a/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb b/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb index 2e03e4bd43c..0ca49bd080b 100644 --- a/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb +++ b/qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb @@ -3,7 +3,7 @@ require 'digest/sha1' module QA - context 'Release', :docker do + context 'Release', :docker, quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/196047' do describe 'Git clone using a deploy key' do before do Flow::Login.sign_in |