diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-28 12:06:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-28 12:06:04 +0300 |
commit | 29eea410c440212730a33ddf610483fe095c8670 (patch) | |
tree | b3071ada8f9524f99bf8479006553b8146365792 /qa | |
parent | 1a3d7b9fcda9e4eecd22b84f4254efc07344b284 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
-rw-r--r-- | qa/qa/specs/features/browser_ui/6_release/deploy_key/clone_using_deploy_key_spec.rb | 5 |
1 files changed, 1 insertions, 4 deletions
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 13e205352de..9dc4bcc8a03 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 @@ -5,10 +5,6 @@ require 'digest/sha1' module QA context 'Release', :docker do describe 'Git clone using a deploy key' do - after do - Runtime::Feature.enable('job_log_json') if @job_log_json_flag_enabled - end - before do # Handle WIP Job Logs flag - https://gitlab.com/gitlab-org/gitlab/issues/31162 @job_log_json_flag_enabled = Runtime::Feature.enabled?('job_log_json') @@ -34,6 +30,7 @@ module QA end after do + Runtime::Feature.enable('job_log_json') if @job_log_json_flag_enabled Service::DockerRun::GitlabRunner.new(@runner_name).remove! end |