diff options
Diffstat (limited to 'qa/qa/ce/strategy.rb')
-rw-r--r-- | qa/qa/ce/strategy.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/qa/qa/ce/strategy.rb b/qa/qa/ce/strategy.rb index 981b60d1920..8143595a18b 100644 --- a/qa/qa/ce/strategy.rb +++ b/qa/qa/ce/strategy.rb @@ -8,12 +8,12 @@ module QA def perform_before_hooks if QA::Runtime::Env.admin_personal_access_token.present? QA::Resource::PersonalAccessTokenCache.set_token_for_username(QA::Runtime::User.admin_username, - QA::Runtime::Env.admin_personal_access_token) + QA::Runtime::Env.admin_personal_access_token) end if QA::Runtime::Env.personal_access_token.present? && QA::Runtime::Env.user_username.present? QA::Resource::PersonalAccessTokenCache.set_token_for_username(QA::Runtime::Env.user_username, - QA::Runtime::Env.personal_access_token) + QA::Runtime::Env.personal_access_token) end # The login page could take some time to load the first time it is visited. @@ -22,6 +22,9 @@ module QA QA::Support::Retrier.retry_on_exception do QA::Runtime::Browser.visit(:gitlab, QA::Page::Main::Login) end + return unless QA::Runtime::Env.allow_local_requests? + + Runtime::ApplicationSettings.set_application_settings(allow_local_requests_from_web_hooks_and_services: true) end end end |