diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-04 10:03:30 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-04 10:03:30 +0000 |
commit | d35df0ad158c14cb28f583f4b26c4196ef23a3f7 (patch) | |
tree | 5a1992758772519104eacb5de2c231721876541c /qa/qa/page/project/settings | |
parent | 3c51da6f5782e53123a7ed5af98ba0828cbfa49f (diff) | |
download | gitlab-ce-d35df0ad158c14cb28f583f4b26c4196ef23a3f7.tar.gz |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'qa/qa/page/project/settings')
-rw-r--r-- | qa/qa/page/project/settings/ci_cd.rb | 10 | ||||
-rw-r--r-- | qa/qa/page/project/settings/repository.rb | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/qa/qa/page/project/settings/ci_cd.rb b/qa/qa/page/project/settings/ci_cd.rb index c43974c10cb..46f93fad61e 100644 --- a/qa/qa/page/project/settings/ci_cd.rb +++ b/qa/qa/page/project/settings/ci_cd.rb @@ -13,16 +13,6 @@ module QA element :variables_settings_content end - view 'app/views/projects/deploy_keys/_index.html.haml' do - element :deploy_keys_settings - end - - def expand_deploy_keys(&block) - expand_section(:deploy_keys_settings) do - Settings::DeployKeys.perform(&block) - end - end - def expand_runners_settings(&block) expand_section(:runners_settings_content) do Settings::Runners.perform(&block) diff --git a/qa/qa/page/project/settings/repository.rb b/qa/qa/page/project/settings/repository.rb index 97dfc6497a4..8810b971fda 100644 --- a/qa/qa/page/project/settings/repository.rb +++ b/qa/qa/page/project/settings/repository.rb @@ -19,12 +19,22 @@ module QA element :deploy_tokens_settings end + view 'app/views/projects/deploy_keys/_index.html.haml' do + element :deploy_keys_settings + end + def expand_deploy_tokens(&block) expand_section(:deploy_tokens_settings) do Settings::DeployTokens.perform(&block) end end + def expand_deploy_keys(&block) + expand_section(:deploy_keys_settings) do + Settings::DeployKeys.perform(&block) + end + end + def expand_protected_branches(&block) expand_section(:protected_branches_settings) do ProtectedBranches.perform(&block) |