diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 00:08:47 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 00:08:47 +0300 |
| commit | e4ea43b2b85ad5f3115f00220601eb719705139a (patch) | |
| tree | 1888a43f802e45ebb8dfed59595a790807777c6f /qa | |
| parent | 390582e118752426acf5cb25ec99103d312d891c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa.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
@@ -1,6 +1,6 @@ # frozen_string_literal: true -$: << File.expand_path(File.dirname(__FILE__)) +$: << File.expand_path(__dir__) Encoding.default_external = 'UTF-8' 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 19cd7d123c9..ca8b917d2c2 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, quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/196047' do + context 'Release', :docker do describe 'Git clone using a deploy key' do before do Flow::Login.sign_in |